From aaafbc2b6f9b4786db58e831919fad59a2a61dd8 Mon Sep 17 00:00:00 2001
From: Christopher Allen <cpcallen+git@google.com>
Date: Tue, 5 Jul 2022 16:27:16 +0100
Subject: [PATCH] fix!: Move backwards-compatibility hacks to main.js (#6260)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix!: Move backwards-compatibility hacks out of blockly.js

  Move accessor properties for Blockly.alert, .confirm,
  .mainWorkspace, .prompt, .selected, .HSV_SATURATION and
  .HSV_VALUE, as well as the hack to allow loading of messages
  via <script> tags, from core/blockly.js to core/main.js,
  which becomes the entrypoint for the first chunk when
  compiled.

  BREAKING CHANGE: The aforementioned properties / hack are no
  longer available in uncompiled mode (or when using advanced
  compilation, unless also compiling against main.js.)

* fix!: Move backwards-compatibility hacks out of contextmenu.js

  Move accessor property for ContextMenu.currentBlock from
  core/contextmenu.js to core/main.js.

* chore: Update deprecation date for Generator.variableDB_ accessors

  Bring the deprecation date forward from May 2026 to September 2022.

  Not technically a breaking change—just a warning that there will
  be a breaking change earlier than previously advertised.

* fix!: Move backwards-compatibility hacks out of tooltip.js

  Move accessor properties for Blockly.Tooltip.visible and .DIV
  from core/tooltip.js to core/main.js.

* fix!: Move backwards-compatibility hacks out of widgetdiv.js

  Move accessor property for Blockly.WidgetDiv.DIV
  from core/widgetdiv.js to core/main.js.
---
 core/blockly.js                  | 175 -------------------
 core/contextmenu.js              |  27 ---
 core/events/events.js            |  26 ---
 core/generator.js                |   4 +-
 core/main.js                     | 291 +++++++++++++++++++++++++++++++
 core/tooltip.js                  |  39 -----
 core/widgetdiv.js                |  20 ---
 scripts/gulpfiles/build_tasks.js |   2 +-
 scripts/gulpfiles/chunks.json    |  17 +-
 9 files changed, 303 insertions(+), 298 deletions(-)
 create mode 100644 core/main.js

diff --git a/core/blockly.js b/core/blockly.js
index 64b643510..55fa06bda 100644
--- a/core/blockly.js
+++ b/core/blockly.js
@@ -347,135 +347,6 @@ exports.setParentContainer = common.setParentContainer;
  * Anything in this section may be removed in a future version of Blockly.
  */
 
-// Add accessors for properties on Blockly that have now been deprecated.
-Object.defineProperties(exports, {
-  /**
-   * Wrapper to window.alert() that app developers may override to
-   * provide alternatives to the modal browser window.
-   * @name Blockly.alert
-   * @type {!function(string, function()=)}
-   * @deprecated Use Blockly.dialog.alert / .setAlert() instead.
-   *     (December 2021)
-   * @suppress {checkTypes}
-   */
-  alert: {
-    set: function(newAlert) {
-      deprecation.warn('Blockly.alert', 'December 2021', 'December 2022');
-      dialog.setAlert(newAlert);
-    },
-    get: function() {
-      deprecation.warn(
-          'Blockly.alert', 'December 2021', 'December 2022',
-          'Blockly.dialog.alert()');
-      return dialog.alert;
-    },
-  },
-  /**
-   * Wrapper to window.confirm() that app developers may override to
-   * provide alternatives to the modal browser window.
-   * @name Blockly.confirm
-   * @type {!function(string, function()=)}
-   * @deprecated Use Blockly.dialog.confirm / .setConfirm() instead.
-   *     (December 2021)
-   * @suppress {checkTypes}
-   */
-  confirm: {
-    set: function(newConfirm) {
-      deprecation.warn('Blockly.confirm', 'December 2021', 'December 2022');
-      dialog.setConfirm(newConfirm);
-    },
-    get: function() {
-      deprecation.warn(
-          'Blockly.confirm', 'December 2021', 'December 2022',
-          'Blockly.dialog.confirm()');
-      return dialog.confirm;
-    },
-  },
-  /**
-   * The main workspace most recently used.
-   * Set by Blockly.WorkspaceSvg.prototype.markFocused
-   * @name Blockly.mainWorkspace
-   * @type {Workspace}
-   * @suppress {checkTypes}
-   */
-  mainWorkspace: {
-    set: function(x) {
-      common.setMainWorkspace(x);
-    },
-    get: function() {
-      return common.getMainWorkspace();
-    },
-  },
-  /**
-   * 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.
-   * @name Blockly.prompt
-   * @type {!function(string, string, function()=)}
-   * @deprecated Use Blockly.dialog.prompt / .setPrompt() instead.
-   *     (December 2021)
-   * @suppress {checkTypes}
-   */
-  prompt: {
-    set: function(newPrompt) {
-      deprecation.warn('Blockly.prompt', 'December 2021', 'December 2022');
-      dialog.setPrompt(newPrompt);
-    },
-    get: function() {
-      deprecation.warn(
-          'Blockly.prompt', 'December 2021', 'December 2022',
-          'Blockly.dialog.prompt()');
-      return dialog.prompt;
-    },
-  },
-  /**
-   * Currently selected block.
-   * @name Blockly.selected
-   * @type {?ICopyable}
-   * @suppress {checkTypes}
-   */
-  selected: {
-    get: function() {
-      return common.getSelected();
-    },
-    set: function(newSelection) {
-      common.setSelected(newSelection);
-    },
-  },
-  /**
-   * The richness of block colours, regardless of the hue.
-   * Must be in the range of 0 (inclusive) to 1 (exclusive).
-   * @name Blockly.HSV_SATURATION
-   * @type {number}
-   * @suppress {checkTypes}
-   */
-  HSV_SATURATION: {
-    get: function() {
-      return utils.colour.getHsvSaturation();
-    },
-    set: function(newValue) {
-      utils.colour.setHsvSaturation(newValue);
-    },
-  },
-  /**
-   * The intensity of block colours, regardless of the hue.
-   * Must be in the range of 0 (inclusive) to 1 (exclusive).
-   * @name Blockly.HSV_VALUE
-   * @type {number}
-   * @suppress {checkTypes}
-   */
-  HSV_VALUE: {
-    get: function() {
-      return utils.colour.getHsvValue();
-    },
-    set: function(newValue) {
-      utils.colour.setHsvValue(newValue);
-    },
-  },
-});
-
 /**
  * Returns the dimensions of the specified SVG image.
  * @param {!SVGElement} svg SVG image.
@@ -840,49 +711,3 @@ exports.thrasos = thrasos;
 exports.uiPosition = uiPosition;
 exports.utils = utils;
 exports.zelos = zelos;
-
-// If Blockly is compiled with ADVANCED_COMPILATION and/or loaded as a
-// CJS or ES module there will not be a Blockly global variable
-// created.  This can cause problems because a very common way of
-// loading translations is to use a <script> tag to load one of
-// msg/js/*.js, which consists of lines like:
-//
-// Blockly.Msg["ADD_COMMENT"] = "Add Comment";
-// Blockly.Msg["CLEAN_UP"] = "Clean up Blocks";
-//
-// This obviously only works if Blockly.Msg is the Msg export from the
-// Blockly.Msg module - so make sure it is, but only if there is not
-// yet a Blockly global variable.
-if (!('Blockly' in globalThis)) {
-  globalThis['Blockly'] = {'Msg': Msg};
-}
-
-// 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.
-//
-// This is only needed in uncompiled mode (see
-// google/blockly-samples#902); in compiled mode the exports object is
-// already the value of globalThis['Blockly'].
-//
-// Note that this code will still attempt to redefine accessors on a
-// previously-imported copy of the Blockly library if both are
-// imported in uncompiled mode.  This will fail with TypeError as the
-// accessors are nonconfigurable (which is good, as otherwise one
-// accessors on one copy would call get/set functions on the other
-// copy!)
-/* eslint-disable-next-line no-undef */
-if (!COMPILED && typeof globalThis['Blockly'] === 'object' &&
-    globalThis['Blockly'] !== exports) {
-  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);
-}
diff --git a/core/contextmenu.js b/core/contextmenu.js
index 715e8a2e2..76d9e279b 100644
--- a/core/contextmenu.js
+++ b/core/contextmenu.js
@@ -20,7 +20,6 @@ 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 eventUtils = goog.require('Blockly.Events.utils');
 const userAgent = goog.require('Blockly.utils.userAgent');
@@ -71,32 +70,6 @@ const setCurrentBlock = function(block) {
 };
 exports.setCurrentBlock = setCurrentBlock;
 
-// Add JS accessors for backwards compatibility.
-Object.defineProperties(exports, {
-  /**
-   * Which block is the context menu attached to?
-   * @name Blockly.ContextMenu.currentBlock
-   * @type {Block}
-   * @deprecated Use Blockly.Tooltip.getCurrentBlock() /
-   *     .setCurrentBlock() instead.  (September 2021)
-   * @suppress {checkTypes}
-   */
-  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);
-    },
-  },
-});
-
 /**
  * Menu object.
  * @type {Menu}
diff --git a/core/events/events.js b/core/events/events.js
index cd393c309..247c8bdda 100644
--- a/core/events/events.js
+++ b/core/events/events.js
@@ -15,7 +15,6 @@
  */
 goog.module('Blockly.Events');
 
-const deprecation = goog.require('Blockly.utils.deprecation');
 const eventUtils = goog.require('Blockly.Events.utils');
 const {Abstract: AbstractEvent} = goog.require('Blockly.Events.Abstract');
 const {BlockBase} = goog.require('Blockly.Events.BlockBase');
@@ -120,28 +119,3 @@ exports.isEnabled = eventUtils.isEnabled;
 exports.setGroup = eventUtils.setGroup;
 exports.setRecordUndo = eventUtils.setRecordUndo;
 exports.disableOrphans = eventUtils.disableOrphans;
-
-Object.defineProperties(exports, {
-  /**
-   * Sets whether the next event should be added to the undo stack.
-   * @name Blockly.Evenents.recordUndo
-   * @type {boolean}
-   * @deprecated Use Blockly.Events.getRecordUndo() and
-   *     .setRecordUndo().  (September 2021)
-   * @suppress {checkTypes}
-   */
-  recordUndo: {
-    get: function() {
-      deprecation.warn(
-          '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()');
-      eventUtils.setRecordUndo(record);
-    },
-  },
-});
diff --git a/core/generator.js b/core/generator.js
index 42cbaf483..666d06b77 100644
--- a/core/generator.js
+++ b/core/generator.js
@@ -547,7 +547,7 @@ Object.defineProperties(Generator.prototype, {
      * @return {!Names|undefined} Name database.
      */
     get: function() {
-      deprecation.warn('variableDB_', 'May 2021', 'May 2026', 'nameDB_');
+      deprecation.warn('variableDB_', 'May 2021', 'September 2022', 'nameDB_');
       return this.nameDB_;
     },
     /**
@@ -555,7 +555,7 @@ Object.defineProperties(Generator.prototype, {
      * @param {!Names|undefined} nameDb New name database.
      */
     set: function(nameDb) {
-      deprecation.warn('variableDB_', 'May 2021', 'May 2026', 'nameDB_');
+      deprecation.warn('variableDB_', 'May 2021', 'September 2022', 'nameDB_');
       this.nameDB_ = nameDb;
     },
   },
diff --git a/core/main.js b/core/main.js
new file mode 100644
index 000000000..f8fd102cf
--- /dev/null
+++ b/core/main.js
@@ -0,0 +1,291 @@
+/**
+ * @license
+ * Copyright 2022 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * @fileoverview The entrypoint for blockly_compressed.js.  Provides
+ *     various backwards-compatibility hacks.  Not used when loading
+ *     in uncompiled (uncompressed) mode via bootstrap.js.
+ */
+'use strict';
+
+goog.module('Blockly.main');
+
+const Blockly = goog.require('Blockly');
+const ContextMenu = goog.require('Blockly.ContextMenu');
+const Events = goog.require('Blockly.Events');
+const Msg = goog.require('Blockly.Msg');
+const Tooltip = goog.require('Blockly.Tooltip');
+const WidgetDiv = goog.require('Blockly.WidgetDiv');
+const colour = goog.require('Blockly.utils.colour');
+const common = goog.require('Blockly.common');
+const deprecation = goog.require('Blockly.utils.deprecation');
+const dialog = goog.require('Blockly.dialog');
+const eventUtils = goog.require('Blockly.Events.utils');
+
+/*
+ * Aliased functions and properties that used to be on the Blockly namespace.
+ * Everything in this section is deprecated. Both external and internal code
+ * should avoid using these functions and use the designated replacements.
+ * Everything in this section will be removed in a future version of Blockly.
+ */
+
+// Add accessors for properties on Blockly that have now been deprecated.
+Object.defineProperties(Blockly, {
+  /**
+   * Wrapper to window.alert() that app developers may override to
+   * provide alternatives to the modal browser window.
+   * @name Blockly.alert
+   * @type {!function(string, function()=)}
+   * @deprecated Use Blockly.dialog.alert / .setAlert() instead.
+   *     (December 2021)
+   * @suppress {checkTypes}
+   */
+  alert: {
+    set: function(newAlert) {
+      deprecation.warn('Blockly.alert', 'December 2021', 'December 2022');
+      dialog.setAlert(newAlert);
+    },
+    get: function() {
+      deprecation.warn(
+          'Blockly.alert', 'December 2021', 'December 2022',
+          'Blockly.dialog.alert()');
+      return dialog.alert;
+    },
+  },
+  /**
+   * Wrapper to window.confirm() that app developers may override to
+   * provide alternatives to the modal browser window.
+   * @name Blockly.confirm
+   * @type {!function(string, function()=)}
+   * @deprecated Use Blockly.dialog.confirm / .setConfirm() instead.
+   *     (December 2021)
+   * @suppress {checkTypes}
+   */
+  confirm: {
+    set: function(newConfirm) {
+      deprecation.warn('Blockly.confirm', 'December 2021', 'December 2022');
+      dialog.setConfirm(newConfirm);
+    },
+    get: function() {
+      deprecation.warn(
+          'Blockly.confirm', 'December 2021', 'December 2022',
+          'Blockly.dialog.confirm()');
+      return dialog.confirm;
+    },
+  },
+  /**
+   * The main workspace most recently used.
+   * Set by Blockly.WorkspaceSvg.prototype.markFocused
+   * @name Blockly.mainWorkspace
+   * @type {Workspace}
+   * @suppress {checkTypes}
+   */
+  mainWorkspace: {
+    set: function(x) {
+      common.setMainWorkspace(x);
+    },
+    get: function() {
+      return common.getMainWorkspace();
+    },
+  },
+  /**
+   * 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.
+   * @name Blockly.prompt
+   * @type {!function(string, string, function()=)}
+   * @deprecated Use Blockly.dialog.prompt / .setPrompt() instead.
+   *     (December 2021)
+   * @suppress {checkTypes}
+   */
+  prompt: {
+    set: function(newPrompt) {
+      deprecation.warn('Blockly.prompt', 'December 2021', 'December 2022');
+      dialog.setPrompt(newPrompt);
+    },
+    get: function() {
+      deprecation.warn(
+          'Blockly.prompt', 'December 2021', 'December 2022',
+          'Blockly.dialog.prompt()');
+      return dialog.prompt;
+    },
+  },
+  /**
+   * Currently selected block.
+   * @name Blockly.selected
+   * @type {?ICopyable}
+   * @suppress {checkTypes}
+   */
+  selected: {
+    get: function() {
+      return common.getSelected();
+    },
+    set: function(newSelection) {
+      common.setSelected(newSelection);
+    },
+  },
+  /**
+   * The richness of block colours, regardless of the hue.
+   * Must be in the range of 0 (inclusive) to 1 (exclusive).
+   * @name Blockly.HSV_SATURATION
+   * @type {number}
+   * @suppress {checkTypes}
+   */
+  HSV_SATURATION: {
+    get: function() {
+      return colour.getHsvSaturation();
+    },
+    set: function(newValue) {
+      colour.setHsvSaturation(newValue);
+    },
+  },
+  /**
+   * The intensity of block colours, regardless of the hue.
+   * Must be in the range of 0 (inclusive) to 1 (exclusive).
+   * @name Blockly.HSV_VALUE
+   * @type {number}
+   * @suppress {checkTypes}
+   */
+  HSV_VALUE: {
+    get: function() {
+      return colour.getHsvValue();
+    },
+    set: function(newValue) {
+      colour.setHsvValue(newValue);
+    },
+  },
+});
+
+// Add accessors for properties on Blockly.ContextMenu that have now
+// been deprecated.
+Object.defineProperties(ContextMenu, {
+  /**
+   * Which block is the context menu attached to?
+   * @name Blockly.ContextMenu.currentBlock
+   * @type {Block}
+   * @deprecated Use Blockly.Tooltip.getCurrentBlock() /
+   *     .setCurrentBlock() instead.  (September 2021)
+   * @suppress {checkTypes}
+   */
+  currentBlock: {
+    get: function() {
+      deprecation.warn(
+          'Blockly.ContextMenu.currentBlock', 'September 2021',
+          'September 2022', 'Blockly.Tooltip.getCurrentBlock()');
+      return ContextMenu.getCurrentBlock();
+    },
+    set: function(block) {
+      deprecation.warn(
+          'Blockly.ContextMenu.currentBlock', 'September 2021',
+          'September 2022', 'Blockly.Tooltip.setCurrentBlock(block)');
+      ContextMenu.setCurrentBlock(block);
+    },
+  },
+});
+
+// Add accessors for properties on Blockly.Events that have now been
+// deprecated.
+Object.defineProperties(Events, {
+  /**
+   * Sets whether the next event should be added to the undo stack.
+   * @name Blockly.Evenents.recordUndo
+   * @type {boolean}
+   * @deprecated Use Blockly.Events.getRecordUndo() and
+   *     .setRecordUndo().  (September 2021)
+   * @suppress {checkTypes}
+   */
+  recordUndo: {
+    get: function() {
+      deprecation.warn(
+          '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()');
+      eventUtils.setRecordUndo(record);
+    },
+  },
+});
+
+
+// Add accessors for properties on Blockly.Tooltip that have now been
+// deprecated.
+Object.defineProperties(Tooltip, {
+  /**
+   * Is a tooltip currently showing?
+   * @name Blockly.Tooltip.visible
+   * @type {boolean}
+   * @deprecated Use Blockly.Tooltip.isVisible() instead.  (September
+   *     2021)
+   * @suppress {checkTypes}
+   */
+  visible: {
+    get: function() {
+      deprecation.warn(
+          'Blockly.Tooltip.visible', 'September 2021', 'September 2022',
+          'Blockly.Tooltip.isVisible()');
+      return Tooltip.isVisible();
+    },
+  },
+  /**
+   * The HTML container.  Set once by createDom.
+   * @name Blockly.Tooltip.DIV
+   * @type {HTMLDivElement}
+   * @deprecated Use Blockly.Tooltip.getDiv() and .setDiv().
+   *     (September 2021)
+   * @suppress {checkTypes}
+   */
+  DIV: {
+    get: function() {
+      deprecation.warn(
+          'Blockly.Tooltip.DIV', 'September 2021', 'September 2022',
+          'Blockly.Tooltip.getDiv()');
+      return Tooltip.getDiv();
+    },
+  },
+});
+
+// Add accessors for properties on Blockly.WidgetDiv that have now been
+// deprecated.
+Object.defineProperties(WidgetDiv, {
+  /**
+   * The HTML container for popup overlays (e.g. editor widgets).
+   * @name Blockly.WidgetDiv.DIV
+   * @type {?Element}
+   * @deprecated Use Blockly.WidgetDiv.getDiv() and .setDiv().
+   *     (September 2021)
+   * @suppress {checkTypes}
+   */
+  DIV: {
+    get: function() {
+      deprecation.warn(
+          'Blockly.WidgetDiv.DIV', 'September 2021', 'September 2022',
+          'Blockly.WidgetDiv.getDiv()');
+      return WidgetDiv.getDiv();
+    },
+  },
+});
+
+// If Blockly is compiled with ADVANCED_COMPILATION and/or loaded as a
+// CJS or ES module there will not be a Blockly global variable
+// created.  This can cause problems because a very common way of
+// loading translations is to use a <script> tag to load one of
+// msg/js/*.js, which consists of lines like:
+//
+// Blockly.Msg["ADD_COMMENT"] = "Add Comment";
+// Blockly.Msg["CLEAN_UP"] = "Clean up Blocks";
+//
+// This obviously only works if Blockly.Msg is the Msg export from the
+// Blockly.Msg module - so make sure it is, but only if there is not
+// yet a Blockly global variable.
+if (!('Blockly' in globalThis)) {
+  globalThis['Blockly'] = {'Msg': Msg};
+}
diff --git a/core/tooltip.js b/core/tooltip.js
index e3436ed0f..e208ea613 100644
--- a/core/tooltip.js
+++ b/core/tooltip.js
@@ -20,7 +20,6 @@ goog.module('Blockly.Tooltip');
 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');
 
 
 /**
@@ -90,25 +89,6 @@ const isVisible = function() {
 };
 exports.isVisible = isVisible;
 
-Object.defineProperties(exports, {
-  /**
-   * Is a tooltip currently showing?
-   * @name Blockly.Tooltip.visible
-   * @type {boolean}
-   * @deprecated Use Blockly.Tooltip.isVisible() instead.  (September
-   *     2021)
-   * @suppress {checkTypes}
-   */
-  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}
@@ -206,25 +186,6 @@ const getDiv = function() {
 };
 exports.getDiv = getDiv;
 
-Object.defineProperties(exports, {
-  /**
-   * The HTML container.  Set once by createDom.
-   * @name Blockly.Tooltip.DIV
-   * @type {HTMLDivElement}
-   * @deprecated Use Blockly.Tooltip.getDiv() and .setDiv().
-   *     (September 2021)
-   * @suppress {checkTypes}
-   */
-  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.
diff --git a/core/widgetdiv.js b/core/widgetdiv.js
index b7fe045b5..3471b4aea 100644
--- a/core/widgetdiv.js
+++ b/core/widgetdiv.js
@@ -20,7 +20,6 @@
 goog.module('Blockly.WidgetDiv');
 
 const common = goog.require('Blockly.common');
-const deprecation = goog.require('Blockly.utils.deprecation');
 const dom = goog.require('Blockly.utils.dom');
 /* eslint-disable-next-line no-unused-vars */
 const {Rect} = goog.requireType('Blockly.utils.Rect');
@@ -81,25 +80,6 @@ const testOnly_setDiv = function(newDiv) {
 };
 exports.testOnly_setDiv = testOnly_setDiv;
 
-Object.defineProperties(exports, {
-  /**
-   * The HTML container for popup overlays (e.g. editor widgets).
-   * @name Blockly.WidgetDiv.DIV
-   * @type {?Element}
-   * @deprecated Use Blockly.WidgetDiv.getDiv() and .setDiv().
-   *     (September 2021)
-   * @suppress {checkTypes}
-   */
-  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.
  * @alias Blockly.WidgetDiv.createDom
diff --git a/scripts/gulpfiles/build_tasks.js b/scripts/gulpfiles/build_tasks.js
index 1bbdb03fe..419dc5093 100644
--- a/scripts/gulpfiles/build_tasks.js
+++ b/scripts/gulpfiles/build_tasks.js
@@ -109,7 +109,7 @@ const NAMESPACE_PROPERTY = '__namespace__';
 const chunks = [
   {
     name: 'blockly',
-    entry: path.join(CORE_DIR, 'blockly.js'),
+    entry: path.join(CORE_DIR, 'main.js'),
     exports: 'module$exports$Blockly',
     reexport: 'Blockly',
   },
diff --git a/scripts/gulpfiles/chunks.json b/scripts/gulpfiles/chunks.json
index 468afc789..e06016933 100644
--- a/scripts/gulpfiles/chunks.json
+++ b/scripts/gulpfiles/chunks.json
@@ -1,12 +1,12 @@
 {
   "chunk": [
-    "blockly:260",
-    "blocks:10:blockly",
-    "all:11:blockly",
-    "all1:11:blockly",
-    "all2:11:blockly",
-    "all3:11:blockly",
-    "all4:11:blockly"
+    "main:261",
+    "blocks:10:main",
+    "all:11:main",
+    "all1:11:main",
+    "all2:11:main",
+    "all3:11:main",
+    "all4:11:main"
   ],
   "js": [
     "./build/src/core/inject.js",
@@ -267,8 +267,9 @@
     "./build/src/core/connection.js",
     "./build/src/core/common.js",
     "./build/src/core/blocks.js",
-    "./build/src/closure/goog/base_minimal.js",
     "./build/src/core/blockly.js",
+    "./build/src/closure/goog/base_minimal.js",
+    "./build/src/core/main.js",
     "./blocks/variables_dynamic.js",
     "./blocks/variables.js",
     "./blocks/text.js",