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