From 6c2a6f21ce1cb88bdfcc2923d2ab7fe42e9dda2c Mon Sep 17 00:00:00 2001
From: Christopher Allen <cpcallen+git@google.com>
Date: Wed, 6 Jul 2022 00:10:26 +0100
Subject: [PATCH 1/2] chore: Apply changes to blockly.js to blockly.ts

---
 core/blockly.ts | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/core/blockly.ts b/core/blockly.ts
index 24a87e9f968..20cfb36909a 100644
--- a/core/blockly.ts
+++ b/core/blockly.ts
@@ -722,17 +722,3 @@ export namespace serialization {
   export const workspaces = serializationWorkspaces;
   export type ISerializer = SerializerInterface;
 };
-
-// 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 as AnyDuringMigration)['Blockly'] = {'Msg': Msg};
-}

From 0031081f806eec125710cbc5cbafc078103f9125 Mon Sep 17 00:00:00 2001
From: Christopher Allen <cpcallen+git@google.com>
Date: Wed, 6 Jul 2022 00:11:31 +0100
Subject: [PATCH 2/2] fix: Build using core/blockly.ts instead of .js

Compiles and runs in compressed mode correctly!
---
 core/blockly.js                  | 714 -------------------------------
 scripts/gulpfiles/build_tasks.js |   4 +-
 scripts/gulpfiles/chunks.json    | 139 +++---
 tsconfig.json                    |   3 -
 4 files changed, 56 insertions(+), 804 deletions(-)
 delete mode 100644 core/blockly.js

diff --git a/core/blockly.js b/core/blockly.js
deleted file mode 100644
index 8631044944e..00000000000
--- a/core/blockly.js
+++ /dev/null
@@ -1,714 +0,0 @@
-/**
- * @license
- * Copyright 2011 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/**
- * @fileoverview The top level namespace used to access the Blockly library.
- * @suppress {moduleImport}
- */
-'use strict';
-
-/**
- * The top level namespace used to access the Blockly library.
- * @namespace Blockly
- */
-goog.module('Blockly');
-
-const ContextMenu = goog.require('Blockly.ContextMenu');
-const ContextMenuItems = goog.require('Blockly.ContextMenuItems');
-const Css = goog.require('Blockly.Css');
-const Events = goog.require('Blockly.Events');
-const Extensions = goog.require('Blockly.Extensions');
-const Procedures = goog.require('Blockly.Procedures');
-const ShortcutItems = goog.require('Blockly.ShortcutItems');
-const Themes = goog.require('Blockly.Themes');
-const Tooltip = goog.require('Blockly.Tooltip');
-const Touch = goog.require('Blockly.Touch');
-const Variables = goog.require('Blockly.Variables');
-const VariablesDynamic = goog.require('Blockly.VariablesDynamic');
-const WidgetDiv = goog.require('Blockly.WidgetDiv');
-const Xml = goog.require('Blockly.Xml');
-const blockAnimations = goog.require('Blockly.blockAnimations');
-const blockRendering = goog.require('Blockly.blockRendering');
-const browserEvents = goog.require('Blockly.browserEvents');
-const bumpObjects = goog.require('Blockly.bumpObjects');
-const clipboard = goog.require('Blockly.clipboard');
-const colour = goog.require('Blockly.utils.colour');
-const common = goog.require('Blockly.common');
-const constants = goog.require('Blockly.constants');
-const deprecation = goog.require('Blockly.utils.deprecation');
-const dialog = goog.require('Blockly.dialog');
-const dropDownDiv = goog.require('Blockly.dropDownDiv');
-const fieldRegistry = goog.require('Blockly.fieldRegistry');
-const geras = goog.require('Blockly.geras');
-const internalConstants = goog.require('Blockly.internalConstants');
-const minimalist = goog.require('Blockly.minimalist');
-const registry = goog.require('Blockly.registry');
-const serializationBlocks = goog.require('Blockly.serialization.blocks');
-const serializationExceptions = goog.require('Blockly.serialization.exceptions');
-const serializationPriorities = goog.require('Blockly.serialization.priorities');
-const serializationRegistry = goog.require('Blockly.serialization.registry');
-const serializationVariables = goog.require('Blockly.serialization.variables');
-const serializationWorkspaces = goog.require('Blockly.serialization.workspaces');
-const svgMath = goog.require('Blockly.utils.svgMath');
-const thrasos = goog.require('Blockly.thrasos');
-const toolbox = goog.require('Blockly.utils.toolbox');
-const uiPosition = goog.require('Blockly.uiPosition');
-const utils = goog.require('Blockly.utils');
-const zelos = goog.require('Blockly.zelos');
-const {Align, Input} = goog.require('Blockly.Input');
-const {ASTNode} = goog.require('Blockly.ASTNode');
-const {BasicCursor} = goog.require('Blockly.BasicCursor');
-const {BlockDragSurfaceSvg} = goog.require('Blockly.BlockDragSurfaceSvg');
-const {BlockDragger} = goog.require('Blockly.BlockDragger');
-const {BlockSvg} = goog.require('Blockly.BlockSvg');
-const {BlocklyOptions} = goog.require('Blockly.BlocklyOptions');
-const {Blocks} = goog.require('Blockly.blocks');
-const {Block} = goog.require('Blockly.Block');
-const {BubbleDragger} = goog.require('Blockly.BubbleDragger');
-const {Bubble} = goog.require('Blockly.Bubble');
-const {CollapsibleToolboxCategory} = goog.require('Blockly.CollapsibleToolboxCategory');
-const {Comment} = goog.require('Blockly.Comment');
-const {ComponentManager} = goog.require('Blockly.ComponentManager');
-const {config} = goog.require('Blockly.config');
-const {ConnectionChecker} = goog.require('Blockly.ConnectionChecker');
-const {ConnectionDB} = goog.require('Blockly.ConnectionDB');
-const {ConnectionType} = goog.require('Blockly.ConnectionType');
-const {Connection} = goog.require('Blockly.Connection');
-const {ContextMenuRegistry} = goog.require('Blockly.ContextMenuRegistry');
-const {Cursor} = goog.require('Blockly.Cursor');
-const {DeleteArea} = goog.require('Blockly.DeleteArea');
-const {DragTarget} = goog.require('Blockly.DragTarget');
-const {FieldAngle} = goog.require('Blockly.FieldAngle');
-const {FieldCheckbox} = goog.require('Blockly.FieldCheckbox');
-const {FieldColour} = goog.require('Blockly.FieldColour');
-const {FieldDropdown} = goog.require('Blockly.FieldDropdown');
-const {FieldImage} = goog.require('Blockly.FieldImage');
-const {FieldLabelSerializable} = goog.require('Blockly.FieldLabelSerializable');
-const {FieldLabel} = goog.require('Blockly.FieldLabel');
-const {FieldMultilineInput} = goog.require('Blockly.FieldMultilineInput');
-const {FieldNumber} = goog.require('Blockly.FieldNumber');
-const {FieldTextInput} = goog.require('Blockly.FieldTextInput');
-const {FieldVariable} = goog.require('Blockly.FieldVariable');
-const {Field} = goog.require('Blockly.Field');
-const {FlyoutButton} = goog.require('Blockly.FlyoutButton');
-const {FlyoutMetricsManager} = goog.require('Blockly.FlyoutMetricsManager');
-const {Flyout} = goog.require('Blockly.Flyout');
-const {Generator} = goog.require('Blockly.Generator');
-const {Gesture} = goog.require('Blockly.Gesture');
-const {Grid} = goog.require('Blockly.Grid');
-const {HorizontalFlyout} = goog.require('Blockly.HorizontalFlyout');
-const {IASTNodeLocationSvg} = goog.require('Blockly.IASTNodeLocationSvg');
-const {IASTNodeLocationWithBlock} = goog.require('Blockly.IASTNodeLocationWithBlock');
-const {IASTNodeLocation} = goog.require('Blockly.IASTNodeLocation');
-const {IAutoHideable} = goog.require('Blockly.IAutoHideable');
-const {IBlockDragger} = goog.require('Blockly.IBlockDragger');
-const {IBoundedElement} = goog.require('Blockly.IBoundedElement');
-const {IBubble} = goog.require('Blockly.IBubble');
-const {ICollapsibleToolboxItem} = goog.require('Blockly.ICollapsibleToolboxItem');
-const {IComponent} = goog.require('Blockly.IComponent');
-const {IConnectionChecker} = goog.require('Blockly.IConnectionChecker');
-const {IContextMenu} = goog.require('Blockly.IContextMenu');
-const {ICopyable} = goog.require('Blockly.ICopyable');
-const {IDeletable} = goog.require('Blockly.IDeletable');
-const {IDeleteArea} = goog.require('Blockly.IDeleteArea');
-const {IDragTarget} = goog.require('Blockly.IDragTarget');
-const {IDraggable} = goog.require('Blockly.IDraggable');
-const {IFlyout} = goog.require('Blockly.IFlyout');
-const {IKeyboardAccessible} = goog.require('Blockly.IKeyboardAccessible');
-const {IMetricsManager} = goog.require('Blockly.IMetricsManager');
-const {IMovable} = goog.require('Blockly.IMovable');
-const {IPositionable} = goog.require('Blockly.IPositionable');
-const {IRegistrableField} = goog.require('Blockly.IRegistrableField');
-const {IRegistrable} = goog.require('Blockly.IRegistrable');
-const {ISelectableToolboxItem} = goog.require('Blockly.ISelectableToolboxItem');
-const {ISelectable} = goog.require('Blockly.ISelectable');
-const {ISerializer} = goog.require('Blockly.serialization.ISerializer');
-const {IStyleable} = goog.require('Blockly.IStyleable');
-const {IToolboxItem} = goog.require('Blockly.IToolboxItem');
-const {IToolbox} = goog.require('Blockly.IToolbox');
-const {Icon} = goog.require('Blockly.Icon');
-const {InsertionMarkerManager} = goog.require('Blockly.InsertionMarkerManager');
-const {Marker} = goog.require('Blockly.Marker');
-const {MarkerManager} = goog.require('Blockly.MarkerManager');
-const {MenuItem} = goog.require('Blockly.MenuItem');
-const {Menu} = goog.require('Blockly.Menu');
-const {MetricsManager} = goog.require('Blockly.MetricsManager');
-const {Mutator} = goog.require('Blockly.Mutator');
-const {Msg} = goog.require('Blockly.Msg');
-const {Names} = goog.require('Blockly.Names');
-const {Options} = goog.require('Blockly.Options');
-const {RenderedConnection} = goog.require('Blockly.RenderedConnection');
-const {ScrollbarPair} = goog.require('Blockly.ScrollbarPair');
-const {Scrollbar} = goog.require('Blockly.Scrollbar');
-const {ShortcutRegistry} = goog.require('Blockly.ShortcutRegistry');
-const {TabNavigateCursor} = goog.require('Blockly.TabNavigateCursor');
-const {ThemeManager} = goog.require('Blockly.ThemeManager');
-const {Theme} = goog.require('Blockly.Theme');
-const {ToolboxCategory} = goog.require('Blockly.ToolboxCategory');
-const {ToolboxItem} = goog.require('Blockly.ToolboxItem');
-const {ToolboxSeparator} = goog.require('Blockly.ToolboxSeparator');
-const {Toolbox} = goog.require('Blockly.Toolbox');
-const {TouchGesture} = goog.require('Blockly.TouchGesture');
-const {Trashcan} = goog.require('Blockly.Trashcan');
-const {VariableMap} = goog.require('Blockly.VariableMap');
-const {VariableModel} = goog.require('Blockly.VariableModel');
-const {VerticalFlyout} = goog.require('Blockly.VerticalFlyout');
-const {Warning} = goog.require('Blockly.Warning');
-const {WorkspaceAudio} = goog.require('Blockly.WorkspaceAudio');
-const {WorkspaceCommentSvg} = goog.require('Blockly.WorkspaceCommentSvg');
-const {WorkspaceComment} = goog.require('Blockly.WorkspaceComment');
-const {WorkspaceDragSurfaceSvg} = goog.require('Blockly.WorkspaceDragSurfaceSvg');
-const {WorkspaceDragger} = goog.require('Blockly.WorkspaceDragger');
-const {WorkspaceSvg, resizeSvgContents} = goog.require('Blockly.WorkspaceSvg');
-const {Workspace} = goog.require('Blockly.Workspace');
-const {ZoomControls} = goog.require('Blockly.ZoomControls');
-const {inject} = goog.require('Blockly.inject');
-const {inputTypes} = goog.require('Blockly.inputTypes');
-/** @suppress {extraRequire} */
-goog.require('Blockly.Events.BlockCreate');
-/** @suppress {extraRequire} */
-goog.require('Blockly.Events.FinishedLoading');
-/** @suppress {extraRequire} */
-goog.require('Blockly.Events.Ui');
-/** @suppress {extraRequire} */
-goog.require('Blockly.Events.UiBase');
-/** @suppress {extraRequire} */
-goog.require('Blockly.Events.VarCreate');
-
-
-/**
- * Blockly core version.
- * This constant is overridden by the build script (npm run build) to the value
- * of the version in package.json. This is done by the Closure Compiler in the
- * buildCompressed gulp task.
- * For local builds, you can pass --define='Blockly.VERSION=X.Y.Z' to the
- * compiler to override this constant.
- * @define {string}
- * @alias Blockly.VERSION
- */
-exports.VERSION = 'uncompiled';
-
-/*
- * Top-level functions and properties on the Blockly namespace.
- * These are used only in external code. Do not reference these
- * from internal code as importing from this file can cause circular
- * dependencies. Do not add new functions here. There is probably a better
- * namespace to put new functions on.
- */
-
-/*
- * Aliases for input alignments used in block defintions.
- */
-
-/**
- * @see Blockly.Input.Align.LEFT
- * @alias Blockly.ALIGN_LEFT
- */
-exports.ALIGN_LEFT = Align.LEFT;
-
-/**
- * @see Blockly.Input.Align.CENTRE
- * @alias Blockly.ALIGN_CENTRE
- */
-exports.ALIGN_CENTRE = Align.CENTRE;
-
-/**
- * @see Blockly.Input.Align.RIGHT
- * @alias Blockly.ALIGN_RIGHT
- */
-exports.ALIGN_RIGHT = Align.RIGHT;
-
-/*
- * Aliases for constants used for connection and input types.
- */
-
-/**
- * @see ConnectionType.INPUT_VALUE
- * @alias Blockly.INPUT_VALUE
- */
-exports.INPUT_VALUE = ConnectionType.INPUT_VALUE;
-
-/**
- * @see ConnectionType.OUTPUT_VALUE
- * @alias Blockly.OUTPUT_VALUE
- */
-exports.OUTPUT_VALUE = ConnectionType.OUTPUT_VALUE;
-
-/**
- * @see ConnectionType.NEXT_STATEMENT
- * @alias Blockly.NEXT_STATEMENT
- */
-exports.NEXT_STATEMENT = ConnectionType.NEXT_STATEMENT;
-
-/**
- * @see ConnectionType.PREVIOUS_STATEMENT
- * @alias Blockly.PREVIOUS_STATEMENT
- */
-exports.PREVIOUS_STATEMENT = ConnectionType.PREVIOUS_STATEMENT;
-
-/**
- * @see inputTypes.DUMMY_INPUT
- * @alias Blockly.DUMMY_INPUT
- */
-exports.DUMMY_INPUT = inputTypes.DUMMY;
-
-/**
- * Aliases for toolbox positions.
- */
-
-/**
- * @see toolbox.Position.TOP
- * @alias Blockly.TOOLBOX_AT_TOP
- */
-exports.TOOLBOX_AT_TOP = toolbox.Position.TOP;
-
-/**
- * @see toolbox.Position.BOTTOM
- * @alias Blockly.TOOLBOX_AT_BOTTOM
- */
-exports.TOOLBOX_AT_BOTTOM = toolbox.Position.BOTTOM;
-
-/**
- * @see toolbox.Position.LEFT
- * @alias Blockly.TOOLBOX_AT_LEFT
- */
-exports.TOOLBOX_AT_LEFT = toolbox.Position.LEFT;
-
-/**
- * @see toolbox.Position.RIGHT
- * @alias Blockly.TOOLBOX_AT_RIGHT
- */
-exports.TOOLBOX_AT_RIGHT = toolbox.Position.RIGHT;
-
-/*
- * Other aliased functions.
- */
-
-/**
- * Size the SVG image to completely fill its container. Call this when the view
- * actually changes sizes (e.g. on a window resize/device orientation change).
- * See workspace.resizeContents to resize the workspace when the contents
- * change (e.g. when a block is added or removed).
- * Record the height/width of the SVG image.
- * @param {!WorkspaceSvg} workspace Any workspace in the SVG.
- * @see Blockly.common.svgResize
- * @alias Blockly.svgResize
- */
-exports.svgResize = common.svgResize;
-
-/**
- * Close tooltips, context menus, dropdown selections, etc.
- * @param {boolean=} opt_onlyClosePopups Whether only popups should be closed.
- * @see Blockly.WorkspaceSvg.hideChaff
- * @alias Blockly.hideChaff
- */
-const hideChaff = function(opt_onlyClosePopups) {
-  /** @type {!WorkspaceSvg} */ (common.getMainWorkspace())
-      .hideChaff(opt_onlyClosePopups);
-};
-exports.hideChaff = hideChaff;
-
-/**
- * Returns the main workspace.  Returns the last used main workspace (based on
- * focus).  Try not to use this function, particularly if there are multiple
- * Blockly instances on a page.
- * @return {!Workspace} The main workspace.
- * @see Blockly.common.getMainWorkspace
- * @alias Blockly.getMainWorkspace
- */
-exports.getMainWorkspace = common.getMainWorkspace;
-
-/**
- * Define blocks from an array of JSON block definitions, as might be generated
- * by the Blockly Developer Tools.
- * @param {!Array<!Object>} jsonArray An array of JSON block definitions.
- * @see Blockly.common.defineBlocksWithJsonArray
- * @alias Blockly.defineBlocksWithJsonArray
- */
-exports.defineBlocksWithJsonArray = common.defineBlocksWithJsonArray;
-
-/**
- * Set the parent container.  This is the container element that the WidgetDiv,
- * dropDownDiv, and Tooltip are rendered into the first time `Blockly.inject`
- * is called.
- * This method is a NOP if called after the first ``Blockly.inject``.
- * @param {!Element} container The container element.
- * @see Blockly.common.setParentContainer
- * @alias Blockly.setParentContainer
- */
-exports.setParentContainer = common.setParentContainer;
-
-/*
- * 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.
- * Anything in this section may be removed in a future version of Blockly.
- */
-
-/**
- * Returns the dimensions of the specified SVG image.
- * @param {!SVGElement} svg SVG image.
- * @return {!Size} Contains width and height properties.
- * @deprecated Use workspace.setCachedParentSvgSize. (2021 March 5)
- * @see Blockly.WorkspaceSvg.setCachedParentSvgSize
- * @alias Blockly.svgSize
- */
-exports.svgSize = svgMath.svgSize;
-
-/**
- * Size the workspace when the contents change.  This also updates
- * scrollbars accordingly.
- * @param {!WorkspaceSvg} workspace The workspace to resize.
- * @deprecated Use workspace.resizeContents. (2021 December)
- * @see Blockly.WorkspaceSvg.resizeContents
- * @alias Blockly.resizeSvgContents
- */
-const resizeSvgContentsLocal = function(workspace) {
-  deprecation.warn(
-      'Blockly.resizeSvgContents', 'December 2021', 'December 2022',
-      'Blockly.WorkspaceSvg.resizeSvgContents');
-  resizeSvgContents(workspace);
-};
-exports.resizeSvgContents = resizeSvgContentsLocal;
-
-/**
- * Copy a block or workspace comment onto the local clipboard.
- * @param {!ICopyable} toCopy Block or Workspace Comment to be copied.
- * @deprecated Use Blockly.clipboard.copy(). (2021 December)
- * @see Blockly.clipboard.copy
- * @alias Blockly.copy
- */
-const copy = function(toCopy) {
-  deprecation.warn(
-      'Blockly.copy', 'December 2021', 'December 2022',
-      'Blockly.clipboard.copy');
-  clipboard.copy(toCopy);
-};
-exports.copy = copy;
-
-/**
- * Paste a block or workspace comment on to the main workspace.
- * @return {boolean} True if the paste was successful, false otherwise.
- * @deprecated Use Blockly.clipboard.paste(). (2021 December)
- * @see Blockly.clipboard.paste
- * @alias Blockly.paste
- */
-const paste = function() {
-  deprecation.warn(
-      'Blockly.paste', 'December 2021', 'December 2022',
-      'Blockly.clipboard.paste');
-  return !!clipboard.paste();
-};
-exports.paste = paste;
-
-/**
- * Duplicate this block and its children, or a workspace comment.
- * @param {!ICopyable} toDuplicate Block or Workspace Comment to be
- *     copied.
- * @deprecated Use Blockly.clipboard.duplicate(). (2021 December)
- * @see Blockly.clipboard.duplicate
- * @alias Blockly.duplicate
- */
-const duplicate = function(toDuplicate) {
-  deprecation.warn(
-      'Blockly.duplicate', 'December 2021', 'December 2022',
-      'Blockly.clipboard.duplicate');
-  clipboard.duplicate(toDuplicate);
-};
-exports.duplicate = duplicate;
-
-/**
- * Is the given string a number (includes negative and decimals).
- * @param {string} str Input string.
- * @return {boolean} True if number, false otherwise.
- * @deprecated Use Blockly.utils.string.isNumber(str). (2021 December)
- * @see Blockly.utils.string.isNumber
- * @alias Blockly.isNumber
- */
-const isNumber = function(str) {
-  deprecation.warn(
-      'Blockly.isNumber', 'December 2021', 'December 2022',
-      'Blockly.utils.string.isNumber');
-  return utils.string.isNumber(str);
-};
-exports.isNumber = isNumber;
-
-/**
- * Convert a hue (HSV model) into an RGB hex triplet.
- * @param {number} hue Hue on a colour wheel (0-360).
- * @return {string} RGB code, e.g. '#5ba65b'.
- * @deprecated Use Blockly.utils.colour.hueToHex(). (2021 December)
- * @see Blockly.utils.colour.hueToHex
- * @alias Blockly.hueToHex
- */
-const hueToHex = function(hue) {
-  deprecation.warn(
-      'Blockly.hueToHex', 'December 2021', 'December 2022',
-      'Blockly.utils.colour.hueToHex');
-  return colour.hueToHex(hue);
-};
-exports.hueToHex = hueToHex;
-
-/**
- * Bind an event handler that should be called regardless of whether it is part
- * of the active touch stream.
- * Use this for events that are not part of a multi-part gesture (e.g.
- * mouseover for tooltips).
- * @param {!EventTarget} node Node upon which to listen.
- * @param {string} name Event name to listen to (e.g. 'mousedown').
- * @param {?Object} thisObject The value of 'this' in the function.
- * @param {!Function} func Function to call when event is triggered.
- * @return {!browserEvents.Data} Opaque data that can be passed to
- *     unbindEvent_.
- * @deprecated Use Blockly.browserEvents.bind(). (December 2021)
- * @see Blockly.browserEvents.bind
- * @alias Blockly.bindEvent_
- */
-const bindEvent_ = function(node, name, thisObject, func) {
-  deprecation.warn(
-      'Blockly.bindEvent_', 'December 2021', 'December 2022',
-      'Blockly.browserEvents.bind');
-  return browserEvents.bind(node, name, thisObject, func);
-};
-exports.bindEvent_ = bindEvent_;
-
-/**
- * Unbind one or more events event from a function call.
- * @param {!browserEvents.Data} bindData Opaque data from bindEvent_.
- *     This list is emptied during the course of calling this function.
- * @return {!Function} The function call.
- * @deprecated Use Blockly.browserEvents.unbind(). (December 2021)
- * @see browserEvents.unbind
- * @alias Blockly.unbindEvent_
- */
-const unbindEvent_ = function(bindData) {
-  deprecation.warn(
-      'Blockly.unbindEvent_', 'December 2021', 'December 2022',
-      'Blockly.browserEvents.unbind');
-  return browserEvents.unbind(bindData);
-};
-exports.unbindEvent_ = unbindEvent_;
-
-/**
- * Bind an event handler that can be ignored if it is not part of the active
- * touch stream.
- * Use this for events that either start or continue a multi-part gesture (e.g.
- * mousedown or mousemove, which may be part of a drag or click).
- * @param {!EventTarget} node Node upon which to listen.
- * @param {string} name Event name to listen to (e.g. 'mousedown').
- * @param {?Object} thisObject The value of 'this' in the function.
- * @param {!Function} func Function to call when event is triggered.
- * @param {boolean=} opt_noCaptureIdentifier True if triggering on this event
- *     should not block execution of other event handlers on this touch or
- *     other simultaneous touches.  False by default.
- * @param {boolean=} opt_noPreventDefault True if triggering on this event
- *     should prevent the default handler.  False by default.  If
- *     opt_noPreventDefault is provided, opt_noCaptureIdentifier must also be
- *     provided.
- * @return {!browserEvents.Data} Opaque data that can be passed to
- *     unbindEvent_.
- * @deprecated Use Blockly.browserEvents.conditionalBind(). (December 2021)
- * @see browserEvents.conditionalBind
- * @alias Blockly.bindEventWithChecks_
- */
-const bindEventWithChecks_ = function(
-    node, name, thisObject, func, opt_noCaptureIdentifier,
-    opt_noPreventDefault) {
-  deprecation.warn(
-      'Blockly.bindEventWithChecks_', 'December 2021', 'December 2022',
-      'Blockly.browserEvents.conditionalBind');
-  return browserEvents.conditionalBind(
-      node, name, thisObject, func, opt_noCaptureIdentifier,
-      opt_noPreventDefault);
-};
-exports.bindEventWithChecks_ = bindEventWithChecks_;
-
-// Aliases to allow external code to access these values for legacy reasons.
-exports.COLLAPSE_CHARS = internalConstants.COLLAPSE_CHARS;
-exports.DRAG_STACK = internalConstants.DRAG_STACK;
-exports.OPPOSITE_TYPE = internalConstants.OPPOSITE_TYPE;
-exports.RENAME_VARIABLE_ID = internalConstants.RENAME_VARIABLE_ID;
-exports.DELETE_VARIABLE_ID = internalConstants.DELETE_VARIABLE_ID;
-exports.COLLAPSED_INPUT_NAME = constants.COLLAPSED_INPUT_NAME;
-exports.COLLAPSED_FIELD_NAME = constants.COLLAPSED_FIELD_NAME;
-
-/**
- * String for use in the "custom" attribute of a category in toolbox XML.
- * This string indicates that the category should be dynamically populated with
- * variable blocks.
- * @const {string}
- * @alias Blockly.VARIABLE_CATEGORY_NAME
- */
-exports.VARIABLE_CATEGORY_NAME = Variables.CATEGORY_NAME;
-
-/**
- * String for use in the "custom" attribute of a category in toolbox XML.
- * This string indicates that the category should be dynamically populated with
- * variable blocks.
- * @const {string}
- * @alias Blockly.VARIABLE_DYNAMIC_CATEGORY_NAME
- */
-exports.VARIABLE_DYNAMIC_CATEGORY_NAME = VariablesDynamic.CATEGORY_NAME;
-/**
- * String for use in the "custom" attribute of a category in toolbox XML.
- * This string indicates that the category should be dynamically populated with
- * procedure blocks.
- * @const {string}
- * @alias Blockly.PROCEDURE_CATEGORY_NAME
- */
-exports.PROCEDURE_CATEGORY_NAME = Procedures.CATEGORY_NAME;
-
-// Re-export submodules that no longer declareLegacyNamespace.
-exports.ASTNode = ASTNode;
-exports.BasicCursor = BasicCursor;
-exports.Block = Block;
-exports.BlocklyOptions = BlocklyOptions;
-exports.BlockDragger = BlockDragger;
-exports.BlockDragSurfaceSvg = BlockDragSurfaceSvg;
-exports.BlockSvg = BlockSvg;
-exports.Blocks = Blocks;
-exports.Bubble = Bubble;
-exports.BubbleDragger = BubbleDragger;
-exports.CollapsibleToolboxCategory = CollapsibleToolboxCategory;
-exports.Comment = Comment;
-exports.ComponentManager = ComponentManager;
-exports.Connection = Connection;
-exports.ConnectionType = ConnectionType;
-exports.ConnectionChecker = ConnectionChecker;
-exports.ConnectionDB = ConnectionDB;
-exports.ContextMenu = ContextMenu;
-exports.ContextMenuItems = ContextMenuItems;
-exports.ContextMenuRegistry = ContextMenuRegistry;
-exports.Css = Css;
-exports.Cursor = Cursor;
-exports.DeleteArea = DeleteArea;
-exports.DragTarget = DragTarget;
-exports.DropDownDiv = dropDownDiv;
-exports.Events = Events;
-exports.Extensions = Extensions;
-exports.Field = Field;
-exports.FieldAngle = FieldAngle;
-exports.FieldCheckbox = FieldCheckbox;
-exports.FieldColour = FieldColour;
-exports.FieldDropdown = FieldDropdown;
-exports.FieldImage = FieldImage;
-exports.FieldLabel = FieldLabel;
-exports.FieldLabelSerializable = FieldLabelSerializable;
-exports.FieldMultilineInput = FieldMultilineInput;
-exports.FieldNumber = FieldNumber;
-exports.FieldTextInput = FieldTextInput;
-exports.FieldVariable = FieldVariable;
-exports.Flyout = Flyout;
-exports.FlyoutButton = FlyoutButton;
-exports.FlyoutMetricsManager = FlyoutMetricsManager;
-exports.Generator = Generator;
-exports.Gesture = Gesture;
-exports.Grid = Grid;
-exports.HorizontalFlyout = HorizontalFlyout;
-exports.IASTNodeLocation = IASTNodeLocation;
-exports.IASTNodeLocationSvg = IASTNodeLocationSvg;
-exports.IASTNodeLocationWithBlock = IASTNodeLocationWithBlock;
-exports.IAutoHideable = IAutoHideable;
-exports.IBlockDragger = IBlockDragger;
-exports.IBoundedElement = IBoundedElement;
-exports.IBubble = IBubble;
-exports.ICollapsibleToolboxItem = ICollapsibleToolboxItem;
-exports.IComponent = IComponent;
-exports.IConnectionChecker = IConnectionChecker;
-exports.IContextMenu = IContextMenu;
-exports.Icon = Icon;
-exports.ICopyable = ICopyable;
-exports.IDeletable = IDeletable;
-exports.IDeleteArea = IDeleteArea;
-exports.IDragTarget = IDragTarget;
-exports.IDraggable = IDraggable;
-exports.IFlyout = IFlyout;
-exports.IKeyboardAccessible = IKeyboardAccessible;
-exports.IMetricsManager = IMetricsManager;
-exports.IMovable = IMovable;
-exports.Input = Input;
-exports.InsertionMarkerManager = InsertionMarkerManager;
-exports.IPositionable = IPositionable;
-exports.IRegistrable = IRegistrable;
-exports.IRegistrableField = IRegistrableField;
-exports.ISelectable = ISelectable;
-exports.ISelectableToolboxItem = ISelectableToolboxItem;
-exports.IStyleable = IStyleable;
-exports.IToolbox = IToolbox;
-exports.IToolboxItem = IToolboxItem;
-exports.Marker = Marker;
-exports.MarkerManager = MarkerManager;
-exports.Menu = Menu;
-exports.MenuItem = MenuItem;
-exports.MetricsManager = MetricsManager;
-exports.Mutator = Mutator;
-exports.Msg = Msg;
-exports.Names = Names;
-exports.Options = Options;
-exports.Procedures = Procedures;
-exports.RenderedConnection = RenderedConnection;
-exports.Scrollbar = Scrollbar;
-exports.ScrollbarPair = ScrollbarPair;
-exports.ShortcutItems = ShortcutItems;
-exports.ShortcutRegistry = ShortcutRegistry;
-exports.TabNavigateCursor = TabNavigateCursor;
-exports.Theme = Theme;
-exports.Themes = Themes;
-exports.ThemeManager = ThemeManager;
-exports.Toolbox = Toolbox;
-exports.ToolboxCategory = ToolboxCategory;
-exports.ToolboxItem = ToolboxItem;
-exports.ToolboxSeparator = ToolboxSeparator;
-exports.Tooltip = Tooltip;
-exports.Touch = Touch;
-exports.TouchGesture = TouchGesture;
-exports.Trashcan = Trashcan;
-exports.VariableMap = VariableMap;
-exports.VariableModel = VariableModel;
-exports.Variables = Variables;
-exports.VariablesDynamic = VariablesDynamic;
-exports.VerticalFlyout = VerticalFlyout;
-exports.Warning = Warning;
-exports.WidgetDiv = WidgetDiv;
-exports.Workspace = Workspace;
-exports.WorkspaceAudio = WorkspaceAudio;
-exports.WorkspaceComment = WorkspaceComment;
-exports.WorkspaceCommentSvg = WorkspaceCommentSvg;
-exports.WorkspaceDragSurfaceSvg = WorkspaceDragSurfaceSvg;
-exports.WorkspaceDragger = WorkspaceDragger;
-exports.WorkspaceSvg = WorkspaceSvg;
-exports.Xml = Xml;
-exports.ZoomControls = ZoomControls;
-exports.blockAnimations = blockAnimations;
-exports.blockRendering = blockRendering;
-exports.browserEvents = browserEvents;
-exports.bumpObjects = bumpObjects;
-exports.clipboard = clipboard;
-exports.common = common;
-exports.config = config;
-/** @deprecated Use Blockly.ConnectionType instead. */
-exports.connectionTypes = ConnectionType;
-exports.constants = constants;
-exports.dialog = dialog;
-exports.fieldRegistry = fieldRegistry;
-exports.geras = geras;
-exports.inject = inject;
-exports.inputTypes = inputTypes;
-exports.minimalist = minimalist;
-exports.registry = registry;
-exports.serialization = {
-  blocks: serializationBlocks,
-  exceptions: serializationExceptions,
-  priorities: serializationPriorities,
-  registry: serializationRegistry,
-  variables: serializationVariables,
-  workspaces: serializationWorkspaces,
-  ISerializer: ISerializer,
-};
-exports.thrasos = thrasos;
-exports.uiPosition = uiPosition;
-exports.utils = utils;
-exports.zelos = zelos;
diff --git a/scripts/gulpfiles/build_tasks.js b/scripts/gulpfiles/build_tasks.js
index 02477aec237..ac037ff0385 100644
--- a/scripts/gulpfiles/build_tasks.js
+++ b/scripts/gulpfiles/build_tasks.js
@@ -110,7 +110,7 @@ const chunks = [
   {
     name: 'blockly',
     entry: path.join(CORE_DIR, 'main.js'),
-    exports: 'module$exports$Blockly',
+    exports: 'module$build$src$core$blockly',
     reexport: 'Blockly',
   },
   {
@@ -653,7 +653,7 @@ function buildCompiled() {
     // declareLegacyNamespace this was very straightforward.  Without
     // it, we have to rely on implmentation details.  See
     // https://github.com/google/closure-compiler/issues/1601#issuecomment-483452226
-    define: `${chunks[0].exports}.VERSION='${packageJson.version}'`,
+    define: `VERSION$$${chunks[0].exports}='${packageJson.version}'`,
     chunk: chunkOptions.chunk,
     chunk_wrapper: chunkOptions.chunk_wrapper,
     rename_prefix_namespace: NAMESPACE_VARIABLE,
diff --git a/scripts/gulpfiles/chunks.json b/scripts/gulpfiles/chunks.json
index f56d6e9387b..ed827caaf72 100644
--- a/scripts/gulpfiles/chunks.json
+++ b/scripts/gulpfiles/chunks.json
@@ -1,6 +1,6 @@
 {
   "chunk": [
-    "main:260",
+    "main:229",
     "blocks:10:main",
     "all:11:main",
     "all1:11:main",
@@ -9,56 +9,13 @@
     "all4:11:main"
   ],
   "js": [
-    "./build/src/core/inject.js",
-    "./build/src/core/workspace_drag_surface_svg.js",
-    "./build/src/core/flyout_vertical.js",
     "./build/src/core/toolbox/toolbox.js",
-    "./build/src/core/interfaces/i_toolbox.js",
-    "./build/src/core/interfaces/i_styleable.js",
-    "./build/src/core/interfaces/i_serializer.js",
-    "./build/src/core/interfaces/i_selectable.js",
-    "./build/src/core/interfaces/i_selectable_toolbox_item.js",
-    "./build/src/core/interfaces/i_registrable.js",
-    "./build/src/core/interfaces/i_registrable_field.js",
-    "./build/src/core/interfaces/i_positionable.js",
-    "./build/src/core/interfaces/i_movable.js",
-    "./build/src/core/utils/metrics.js",
-    "./build/src/core/interfaces/i_metrics_manager.js",
-    "./build/src/core/interfaces/i_keyboard_accessible.js",
-    "./build/src/core/interfaces/i_flyout.js",
-    "./build/src/core/interfaces/i_drag_target.js",
-    "./build/src/core/interfaces/i_draggable.js",
-    "./build/src/core/interfaces/i_delete_area.js",
-    "./build/src/core/interfaces/i_deletable.js",
-    "./build/src/core/interfaces/i_copyable.js",
-    "./build/src/core/interfaces/i_contextmenu.js",
-    "./build/src/core/interfaces/i_connection_checker.js",
-    "./build/src/core/interfaces/i_component.js",
-    "./build/src/core/interfaces/i_toolbox_item.js",
-    "./build/src/core/interfaces/i_collapsible_toolbox_item.js",
-    "./build/src/core/interfaces/i_bubble.js",
-    "./build/src/core/interfaces/i_bounded_element.js",
-    "./build/src/core/interfaces/i_block_dragger.js",
-    "./build/src/core/interfaces/i_autohideable.js",
-    "./build/src/core/interfaces/i_ast_node_location.js",
-    "./build/src/core/interfaces/i_ast_node_location_with_block.js",
-    "./build/src/core/interfaces/i_ast_node_location_svg.js",
-    "./build/src/core/flyout_horizontal.js",
-    "./build/src/core/generator.js",
-    "./build/src/core/scrollbar_pair.js",
-    "./build/src/core/flyout_base.js",
-    "./build/src/core/flyout_metrics_manager.js",
-    "./build/src/core/flyout_button.js",
-    "./build/src/core/field_variable.js",
-    "./build/src/core/field_number.js",
-    "./build/src/core/field_multilineinput.js",
-    "./build/src/core/field_label_serializable.js",
-    "./build/src/core/field_colour.js",
-    "./build/src/core/field_checkbox.js",
-    "./build/src/core/field_angle.js",
     "./build/src/core/toolbox/collapsible_category.js",
-    "./build/src/core/blockly_options.js",
-    "./build/src/core/block_drag_surface.js",
+    "./build/src/core/theme/zelos.js",
+    "./build/src/core/theme/themes.js",
+    "./build/src/core/shortcut_items.js",
+    "./build/src/core/serialization/workspaces.js",
+    "./build/src/core/serialization/variables.js",
     "./build/src/core/renderers/zelos/renderer.js",
     "./build/src/core/renderers/zelos/path_object.js",
     "./build/src/core/renderers/zelos/marker_svg.js",
@@ -66,8 +23,6 @@
     "./build/src/core/renderers/zelos/measurables/row_elements.js",
     "./build/src/core/renderers/zelos/measurables/inputs.js",
     "./build/src/core/renderers/zelos/measurables/bottom_row.js",
-    "./build/src/core/field_textinput.js",
-    "./build/src/core/field_image.js",
     "./build/src/core/renderers/zelos/info.js",
     "./build/src/core/renderers/zelos/drawer.js",
     "./build/src/core/renderers/zelos/constants.js",
@@ -75,8 +30,6 @@
     "./build/src/core/renderers/thrasos/renderer.js",
     "./build/src/core/renderers/thrasos/info.js",
     "./build/src/core/renderers/thrasos/thrasos.js",
-    "./build/src/core/serialization/workspaces.js",
-    "./build/src/core/serialization/variables.js",
     "./build/src/core/renderers/minimalist/renderer.js",
     "./build/src/core/renderers/minimalist/info.js",
     "./build/src/core/renderers/minimalist/drawer.js",
@@ -92,43 +45,44 @@
     "./build/src/core/renderers/geras/drawer.js",
     "./build/src/core/renderers/geras/constants.js",
     "./build/src/core/renderers/geras/geras.js",
-    "./build/src/core/theme/zelos.js",
-    "./build/src/core/theme/themes.js",
-    "./build/src/core/shortcut_items.js",
+    "./build/src/core/workspace_drag_surface_svg.js",
+    "./build/src/core/inject.js",
+    "./build/src/core/generator.js",
+    "./build/src/core/flyout_vertical.js",
+    "./build/src/core/flyout_horizontal.js",
+    "./build/src/core/scrollbar_pair.js",
+    "./build/src/core/flyout_metrics_manager.js",
+    "./build/src/core/flyout_button.js",
+    "./build/src/core/flyout_base.js",
+    "./build/src/core/field_variable.js",
+    "./build/src/core/field_number.js",
+    "./build/src/core/field_multilineinput.js",
+    "./build/src/core/field_label_serializable.js",
+    "./build/src/core/field_image.js",
+    "./build/src/core/field_colour.js",
+    "./build/src/core/field_checkbox.js",
+    "./build/src/core/field_textinput.js",
+    "./build/src/core/field_angle.js",
     "./build/src/core/events/events_block_move.js",
     "./build/src/core/events/events_comment_move.js",
     "./build/src/core/events/events_toolbox_item_select.js",
-    "./build/src/core/events/events_ui.js",
-    "./build/src/core/events/workspace_events.js",
     "./build/src/core/events/events.js",
     "./build/src/core/contextmenu_items.js",
-    "./build/src/closure/goog/goog.js",
-    "./build/src/core/touch.js",
-    "./build/src/core/utils/useragent.js",
-    "./build/src/core/browser_events.js",
-    "./build/src/core/clipboard.js",
-    "./build/src/core/config.js",
-    "./build/src/core/registry.js",
-    "./build/src/core/utils/idgenerator.js",
-    "./build/src/core/events/utils.js",
-    "./build/src/core/contextmenu.js",
-    "./build/src/core/events/events_var_rename.js",
-    "./build/src/core/events/events_var_delete.js",
-    "./build/src/core/variable_map.js",
+    "./build/src/core/block_drag_surface.js",
+    "./build/src/core/events/events_ui.js",
+    "./build/src/core/events/workspace_events.js",
     "./build/src/core/serialization/registry.js",
     "./build/src/core/serialization/priorities.js",
     "./build/src/core/serialization/exceptions.js",
-    "./build/src/core/utils/size.js",
-    "./build/src/core/serialization/blocks.js",
+    "./build/src/core/events/events_var_rename.js",
+    "./build/src/core/events/events_var_delete.js",
+    "./build/src/core/variable_map.js",
     "./build/src/core/constants.js",
     "./build/src/core/connection.js",
     "./build/src/core/connection_checker.js",
     "./build/src/core/workspace.js",
-    "./build/src/core/menuitem.js",
-    "./build/src/core/menu.js",
     "./build/src/core/field_dropdown.js",
     "./build/src/core/workspace_audio.js",
-    "./build/src/core/utils/keycodes.js",
     "./build/src/core/utils.js",
     "./build/src/core/drag_target.js",
     "./build/src/core/delete_area.js",
@@ -140,6 +94,7 @@
     "./build/src/core/renderers/common/path_object.js",
     "./build/src/core/events/events_marker_move.js",
     "./build/src/core/renderers/common/marker_svg.js",
+    "./build/src/core/input_types.js",
     "./build/src/core/input.js",
     "./build/src/core/renderers/common/info.js",
     "./build/src/core/renderers/common/drawer.js",
@@ -178,18 +133,11 @@
     "./build/src/core/keyboard_nav/tab_navigate_cursor.js",
     "./build/src/core/keyboard_nav/ast_node.js",
     "./build/src/core/field_registry.js",
-    "./build/src/core/widgetdiv.js",
     "./build/src/core/utils/sentinel.js",
     "./build/src/core/marker_manager.js",
     "./build/src/core/dropdowndiv.js",
     "./build/src/core/workspace_dragger.js",
     "./build/src/core/tooltip.js",
-    "./build/src/core/events/events_comment_change.js",
-    "./build/src/core/workspace_comment.js",
-    "./build/src/core/events/events_comment_delete.js",
-    "./build/src/core/events/events_comment_base.js",
-    "./build/src/core/events/events_comment_create.js",
-    "./build/src/core/workspace_comment_svg.js",
     "./build/src/core/bubble_dragger.js",
     "./build/src/core/insertion_marker_manager.js",
     "./build/src/core/bump_objects.js",
@@ -200,6 +148,18 @@
     "./build/src/core/field.js",
     "./build/src/core/field_label.js",
     "./build/src/core/contextmenu_registry.js",
+    "./build/src/core/events/events_comment_change.js",
+    "./build/src/core/workspace_comment.js",
+    "./build/src/core/events/events_comment_delete.js",
+    "./build/src/core/events/events_comment_base.js",
+    "./build/src/core/events/events_comment_create.js",
+    "./build/src/core/workspace_comment_svg.js",
+    "./build/src/core/widgetdiv.js",
+    "./build/src/core/menuitem.js",
+    "./build/src/core/utils/keycodes.js",
+    "./build/src/core/menu.js",
+    "./build/src/core/clipboard.js",
+    "./build/src/core/contextmenu.js",
     "./build/src/core/block_animations.js",
     "./build/src/core/events/events_selected.js",
     "./build/src/core/block_svg.js",
@@ -222,6 +182,7 @@
     "./build/src/core/theme.js",
     "./build/src/core/options.js",
     "./build/src/core/icon.js",
+    "./build/src/core/config.js",
     "./build/src/core/utils/math.js",
     "./build/src/core/utils/style.js",
     "./build/src/core/utils/rect.js",
@@ -229,10 +190,13 @@
     "./build/src/core/utils/svg.js",
     "./build/src/core/utils/coordinate.js",
     "./build/src/core/scrollbar.js",
+    "./build/src/core/touch.js",
+    "./build/src/core/browser_events.js",
     "./build/src/core/toolbox/separator.js",
     "./build/src/core/toolbox/toolbox_item.js",
     "./build/src/core/msg.js",
     "./build/src/core/utils/parsing.js",
+    "./build/src/core/utils/useragent.js",
     "./build/src/core/utils/dom.js",
     "./build/src/core/utils/colour.js",
     "./build/src/core/utils/aria.js",
@@ -240,6 +204,7 @@
     "./build/src/core/css.js",
     "./build/src/core/toolbox/category.js",
     "./build/src/core/utils/toolbox.js",
+    "./build/src/core/utils/size.js",
     "./build/src/core/metrics_manager.js",
     "./build/src/core/bubble.js",
     "./build/src/core/events/events_ui_base.js",
@@ -247,7 +212,6 @@
     "./build/src/core/mutator.js",
     "./build/src/core/extensions.js",
     "./build/src/core/events/events_block_delete.js",
-    "./build/src/core/events/events_block_create.js",
     "./build/src/core/events/events_abstract.js",
     "./build/src/core/events/events_block_base.js",
     "./build/src/core/events/events_block_change.js",
@@ -262,10 +226,15 @@
     "./build/src/core/comment.js",
     "./build/src/core/xml.js",
     "./build/src/core/utils/xml.js",
-    "./build/src/core/input_types.js",
     "./build/src/core/connection_type.js",
     "./build/src/core/blocks.js",
     "./build/src/core/common.js",
+    "./build/src/core/utils/idgenerator.js",
+    "./build/src/core/events/utils.js",
+    "./build/src/core/serialization/blocks.js",
+    "./build/src/core/registry.js",
+    "./build/src/core/events/events_block_create.js",
+    "./build/src/closure/goog/goog.js",
     "./build/src/core/blockly.js",
     "./build/src/closure/goog/base_minimal.js",
     "./build/src/core/main.js",
diff --git a/tsconfig.json b/tsconfig.json
index 9b2f92082f1..f167444b358 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -3,9 +3,6 @@
     "core/**/*",  // N.B.: also pulls in closure/goog/goog.js if needed.
     "closure/**/*",  // Just for ouptut directory structure.
   ],
-  "exclude": [
-    "core/blockly.ts"
-  ],
   "compilerOptions": {
     // Tells TypeScript to read JS files, as
     // normally they are ignored as source files