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] 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'});