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