From da6fe1ac386ee9b3ad174e9af1f4a4e45f95b6ad Mon Sep 17 00:00:00 2001
From: Rachel Fenichel <fenichel@google.com>
Date: Tue, 9 Feb 2021 14:34:23 -0800
Subject: [PATCH 1/5] Fix missing requires in the insertion marker manager

---
 core/insertion_marker_manager.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/core/insertion_marker_manager.js b/core/insertion_marker_manager.js
index 661aa5fa8..490e88ef3 100644
--- a/core/insertion_marker_manager.js
+++ b/core/insertion_marker_manager.js
@@ -12,10 +12,16 @@
 
 goog.provide('Blockly.InsertionMarkerManager');
 
+goog.require('Blockly.Block');
 goog.require('Blockly.blockAnimations');
 goog.require('Blockly.constants');
 goog.require('Blockly.Events');
 
+goog.requireType('Blockly.BlockSvg');
+goog.requireType('Blockly.RenderedConnection');
+goog.requireType('Blockly.utils.Coordinate');
+goog.requireType('Blockly.WorkspaceSvg');
+
 
 /**
  * Class that controls updates to connections during drags.  It is primarily

From c449a3ec6c62f3dc8e6634667e42e5e42fc394cb Mon Sep 17 00:00:00 2001
From: Rachel Fenichel <fenichel@google.com>
Date: Tue, 9 Feb 2021 14:41:58 -0800
Subject: [PATCH 2/5] Fix missing requires in input and xml

---
 core/input.js | 6 ++++++
 core/xml.js   | 9 +++++++++
 2 files changed, 15 insertions(+)

diff --git a/core/input.js b/core/input.js
index 9a165226e..6f7b63b7a 100644
--- a/core/input.js
+++ b/core/input.js
@@ -16,6 +16,12 @@ goog.require('Blockly.Connection');
 goog.require('Blockly.constants');
 goog.require('Blockly.fieldRegistry');
 
+goog.requireType('Blockly.Block');
+goog.requireType('Blockly.BlockSvg');
+goog.requireType('Blockly.Field');
+goog.requireType('Blockly.FieldDropdown');
+goog.requireType('Blockly.RenderedConnection');
+
 
 /**
  * Class for an input with an optional field.
diff --git a/core/xml.js b/core/xml.js
index 7a887a29e..21f5770e2 100644
--- a/core/xml.js
+++ b/core/xml.js
@@ -24,7 +24,16 @@ goog.require('Blockly.Events.VarCreate');
 goog.require('Blockly.utils');
 goog.require('Blockly.utils.dom');
 goog.require('Blockly.utils.global');
+goog.require('Blockly.utils.Size');
 goog.require('Blockly.utils.xml');
+goog.require('Blockly.Variables');
+
+goog.requireType('Blockly.Block');
+goog.requireType('Blockly.Comment');
+goog.requireType('Blockly.Connection');
+goog.requireType('Blockly.Field');
+goog.requireType('Blockly.Workspace');
+goog.requireType('Blockly.VariableModel');
 
 
 /**

From 994fc2ce1f9e5d037885686ec6fec76d2ae31119 Mon Sep 17 00:00:00 2001
From: Rachel Fenichel <fenichel@google.com>
Date: Tue, 9 Feb 2021 14:47:14 -0800
Subject: [PATCH 3/5] Fix missing requires in dropdown div and widget div

---
 core/dropdowndiv.js | 7 +++++--
 core/widgetdiv.js   | 2 ++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/core/dropdowndiv.js b/core/dropdowndiv.js
index 770af679f..d7d383cbc 100644
--- a/core/dropdowndiv.js
+++ b/core/dropdowndiv.js
@@ -17,10 +17,13 @@ goog.provide('Blockly.DropDownDiv');
 
 goog.require('Blockly.utils.dom');
 goog.require('Blockly.utils.math');
+goog.require('Blockly.utils.Rect');
 goog.require('Blockly.utils.style');
 
-goog.requireType('Blockly.utils.Rect');
+goog.requireType('Blockly.BlockSvg');
+goog.requireType('Blockly.Field');
 goog.requireType('Blockly.utils.Size');
+goog.requireType('Blockly.WorkspaceSvg');
 
 
 /**
@@ -148,7 +151,7 @@ Blockly.DropDownDiv.BoundsInfo;
  * }}
  */
 Blockly.DropDownDiv.PositionMetrics;
- 
+
 /**
  * Create and insert the DOM element for this div.
  * @package
diff --git a/core/widgetdiv.js b/core/widgetdiv.js
index 37631bd2b..bd2734f96 100644
--- a/core/widgetdiv.js
+++ b/core/widgetdiv.js
@@ -18,10 +18,12 @@
  */
 goog.provide('Blockly.WidgetDiv');
 
+goog.require('Blockly.utils.dom');
 goog.require('Blockly.utils.style');
 
 goog.requireType('Blockly.utils.Rect');
 goog.requireType('Blockly.utils.Size');
+goog.requireType('Blockly.WorkspaceSvg');
 
 
 /**

From 9002492476944c39f239d057fb98e843ce804122 Mon Sep 17 00:00:00 2001
From: Rachel Fenichel <fenichel@google.com>
Date: Tue, 9 Feb 2021 15:01:05 -0800
Subject: [PATCH 4/5] Fix missing require types in workspace svg

---
 core/workspace_svg.js | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/core/workspace_svg.js b/core/workspace_svg.js
index 619056e69..8b5a47106 100644
--- a/core/workspace_svg.js
+++ b/core/workspace_svg.js
@@ -43,10 +43,20 @@ goog.require('Blockly.WorkspaceAudio');
 goog.require('Blockly.WorkspaceDragSurfaceSvg');
 goog.require('Blockly.Xml');
 
+goog.requireType('Blockly.Block');
+goog.requireType('Blockly.BlockDragSurfaceSvg');
 goog.requireType('Blockly.blockRendering.Renderer');
+goog.requireType('Blockly.FlyoutButton');
 goog.requireType('Blockly.IASTNodeLocationSvg');
 goog.requireType('Blockly.IBoundedElement');
 goog.requireType('Blockly.IFlyout');
+goog.requireType('Blockly.IToolbox');
+goog.requireType('Blockly.Marker');
+goog.requireType('Blockly.Theme');
+goog.requireType('Blockly.Trashcan');
+goog.requireType('Blockly.utils.Size');
+goog.requireType('Blockly.VariableModel');
+goog.requireType('Blockly.ZoomControls');
 
 
 /**

From f35aeb22b4b1c660f66b9c483759aa3f72bd9e4c Mon Sep 17 00:00:00 2001
From: Rachel Fenichel <fenichel@google.com>
Date: Tue, 9 Feb 2021 15:22:55 -0800
Subject: [PATCH 5/5] Remove circular dependency

---
 core/xml.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/core/xml.js b/core/xml.js
index 21f5770e2..d8c382a9c 100644
--- a/core/xml.js
+++ b/core/xml.js
@@ -26,7 +26,6 @@ goog.require('Blockly.utils.dom');
 goog.require('Blockly.utils.global');
 goog.require('Blockly.utils.Size');
 goog.require('Blockly.utils.xml');
-goog.require('Blockly.Variables');
 
 goog.requireType('Blockly.Block');
 goog.requireType('Blockly.Comment');