From e0693a65d2b428b58e4c9caaf1abe346688ac4d9 Mon Sep 17 00:00:00 2001 From: Aaron Dodson Date: Thu, 23 Sep 2021 14:48:52 -0700 Subject: [PATCH] chore: Remove declareLegacyNamespace() from files in core (#5525) * chore: Remove declareLegacyNamespace() from files in core * fix: Update missing/errant re-exports in blockly.js --- core/blockly.js | 147 ++++++++++++++++++++++++++++- core/blockly_options.js | 1 - core/browser_events.js | 1 - core/bubble.js | 1 - core/bubble_dragger.js | 1 - core/clipboard.js | 1 - core/comment.js | 1 - core/common.js | 1 - core/component_manager.js | 1 - core/connection.js | 1 - core/connection_checker.js | 1 - core/connection_db.js | 1 - core/connection_types.js | 1 - core/constants.js | 1 - core/contextmenu.js | 3 - core/contextmenu_items.js | 1 - core/contextmenu_registry.js | 1 - core/css.js | 1 - core/delete_area.js | 1 - core/dialog.js | 1 - core/drag_target.js | 1 - core/dropdowndiv.js | 1 - core/extensions.js | 1 - core/field_angle.js | 1 - core/flyout_base.js | 1 - core/flyout_button.js | 1 - core/flyout_horizontal.js | 1 - core/flyout_metrics_manager.js | 1 - core/flyout_vertical.js | 1 - core/generator.js | 1 - core/gesture.js | 1 - core/grid.js | 1 - core/icon.js | 1 - core/inject.js | 1 - core/input.js | 1 - core/input_types.js | 1 - core/insertion_marker_manager.js | 3 - core/internal_constants.js | 1 - core/marker_manager.js | 1 - core/menu.js | 1 - core/menuitem.js | 1 - core/metrics_manager.js | 1 - core/mutator.js | 1 - core/names.js | 1 - core/options.js | 1 - core/positionable_helpers.js | 1 - core/procedures.js | 1 - core/registry.js | 1 - core/rendered_connection.js | 1 - core/scrollbar.js | 3 - core/scrollbar_pair.js | 1 - core/shortcut_items.js | 1 - core/shortcut_registry.js | 1 - core/theme.js | 1 - core/theme_manager.js | 1 - core/tooltip.js | 1 - core/touch.js | 1 - core/touch_gesture.js | 1 - core/trashcan.js | 1 - core/utils.js | 1 - core/variable_map.js | 1 - core/variable_model.js | 1 - core/variables.js | 1 - core/variables_dynamic.js | 1 - core/warning.js | 1 - core/widgetdiv.js | 1 - core/workspace.js | 1 - core/workspace_audio.js | 1 - core/workspace_comment.js | 1 - core/workspace_comment_svg.js | 1 - core/workspace_drag_surface_svg.js | 1 - core/workspace_dragger.js | 3 - core/workspace_svg.js | 1 - core/xml.js | 1 - core/zoom_controls.js | 1 - tests/deps.js | 4 +- tests/deps.mocha.js | 4 +- 77 files changed, 147 insertions(+), 90 deletions(-) diff --git a/core/blockly.js b/core/blockly.js index 602597ae5..e30a54681 100644 --- a/core/blockly.js +++ b/core/blockly.js @@ -17,9 +17,26 @@ goog.module('Blockly'); goog.module.declareLegacyNamespace(); +const BlocklyOptions = goog.require('Blockly.BlocklyOptions'); const Blocks = goog.require('Blockly.Blocks'); +const Bubble = goog.require('Blockly.Bubble'); +const BubbleDragger = goog.require('Blockly.BubbleDragger'); const CollapsibleToolboxCategory = goog.require('Blockly.CollapsibleToolboxCategory'); +const Comment = goog.require('Blockly.Comment'); +const ComponentManager = goog.require('Blockly.ComponentManager'); +const ConnectionChecker = goog.require('Blockly.ConnectionChecker'); +const ConnectionDB = goog.require('Blockly.ConnectionDB'); +const Connection = goog.require('Blockly.Connection'); +const ContextMenu = goog.require('Blockly.ContextMenu'); +const ContextMenuItems = goog.require('Blockly.ContextMenuItems'); +const ContextMenuRegistry = goog.require('Blockly.ContextMenuRegistry'); +const Css = goog.require('Blockly.Css'); +const DeleteArea = goog.require('Blockly.DeleteArea'); +const DragTarget = goog.require('Blockly.DragTarget'); +const DropDownDiv = goog.require('Blockly.DropDownDiv'); +const Extensions = goog.require('Blockly.Extensions'); const Field = goog.require('Blockly.Field'); +const FieldAngle = goog.require('Blockly.FieldAngle'); const FieldCheckbox = goog.require('Blockly.FieldCheckbox'); const FieldColour = goog.require('Blockly.FieldColour'); const FieldDropdown = goog.require('Blockly.FieldDropdown'); @@ -30,20 +47,63 @@ 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 Flyout = goog.require('Blockly.Flyout'); +const FlyoutButton = goog.require('Blockly.FlyoutButton'); +const FlyoutMetricsManager = goog.require('Blockly.FlyoutMetricsManager'); +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 Icon = goog.require('Blockly.Icon'); /* eslint-disable-next-line no-unused-vars */ const ICopyable = goog.requireType('Blockly.ICopyable'); +const Input = goog.require('Blockly.Input'); +const InsertionMarkerManager = goog.require('Blockly.InsertionMarkerManager'); const Marker = goog.require('Blockly.Marker'); +const MarkerManager = goog.require('Blockly.MarkerManager'); +const Menu = goog.require('Blockly.Menu'); +const MenuItem = goog.require('Blockly.MenuItem'); +const MetricsManager = goog.require('Blockly.MetricsManager'); +const Mutator = goog.require('Blockly.Mutator'); +const Names = goog.require('Blockly.Names'); +const Options = goog.require('Blockly.Options'); +const Procedures = goog.require('Blockly.Procedures'); +const RenderedConnection = goog.require('Blockly.RenderedConnection'); +const Scrollbar = goog.require('Blockly.Scrollbar'); +const ScrollbarPair = goog.require('Blockly.ScrollbarPair'); +const ShortcutItems = goog.require('Blockly.ShortcutItems'); +const ShortcutRegistry = goog.require('Blockly.ShortcutRegistry'); const Size = goog.require('Blockly.utils.Size'); const TabNavigateCursor = goog.require('Blockly.TabNavigateCursor'); +const Theme = goog.require('Blockly.Theme'); +const ThemeManager = goog.require('Blockly.ThemeManager'); const Toolbox = goog.require('Blockly.Toolbox'); const ToolboxCategory = goog.require('Blockly.ToolboxCategory'); const ToolboxItem = goog.require('Blockly.ToolboxItem'); const ToolboxSeparator = goog.require('Blockly.ToolboxSeparator'); -/* eslint-disable-next-line no-unused-vars */ -const Workspace = goog.requireType('Blockly.Workspace'); -/* eslint-disable-next-line no-unused-vars */ -const WorkspaceSvg = goog.requireType('Blockly.WorkspaceSvg'); +const Tooltip = goog.require('Blockly.Tooltip'); +const Touch = goog.require('Blockly.Touch'); +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 Variables = goog.require('Blockly.Variables'); +const VariablesDynamic = goog.require('Blockly.VariablesDynamic'); +const VerticalFlyout = goog.require('Blockly.VerticalFlyout'); +const Warning = goog.require('Blockly.Warning'); +const WidgetDiv = goog.require('Blockly.WidgetDiv'); +const Workspace = goog.require('Blockly.Workspace'); +const WorkspaceAudio = goog.require('Blockly.WorkspaceAudio'); +const WorkspaceComment = goog.require('Blockly.WorkspaceComment'); +const WorkspaceCommentSvg = goog.require('Blockly.WorkspaceCommentSvg'); +const WorkspaceDragSurfaceSvg = goog.require('Blockly.WorkspaceDragSurfaceSvg'); +const WorkspaceDragger = goog.require('Blockly.WorkspaceDragger'); +const WorkspaceSvg = goog.require('Blockly.WorkspaceSvg'); +const Xml = goog.require('Blockly.Xml'); +const ZoomControls = goog.require('Blockly.ZoomControls'); +const blockAnimations = goog.require('Blockly.blockAnimations'); 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'); @@ -52,9 +112,13 @@ const constants = goog.require('Blockly.constants'); const deprecation = goog.require('Blockly.utils.deprecation'); const dialog = goog.require('Blockly.dialog'); const fieldRegistry = goog.require('Blockly.fieldRegistry'); +const inject = goog.require('Blockly.inject'); const inputTypes = goog.require('Blockly.inputTypes'); const internalConstants = goog.require('Blockly.internalConstants'); +const registry = goog.require('Blockly.registry'); const toolbox = goog.require('Blockly.utils.toolbox'); +const uiPosition = goog.require('Blockly.uiPosition'); +const utils = goog.require('Blockly.utils'); const {Block} = goog.require('Blockly.Block'); const {BlockDragger} = goog.require('Blockly.BlockDragger'); const {BlockDragSurfaceSvg} = goog.require('Blockly.BlockDragSurfaceSvg'); @@ -439,12 +503,29 @@ exports.COLLAPSED_FIELD_NAME = constants.COLLAPSED_FIELD_NAME; exports.ASTNode = ASTNode; exports.BasicCursor = BasicCursor; exports.Block = Block; +exports.BlocklyOptions = BlocklyOptions; exports.BlockDragger = BlockDragger; exports.BlockDragSurfaceSvg = BlockDragSurfaceSvg; exports.BlockSvg = BlockSvg; +exports.Bubble = Bubble; +exports.BubbleDragger = BubbleDragger; exports.CollapsibleToolboxCategory = CollapsibleToolboxCategory; +exports.Comment = Comment; +exports.ComponentManager = ComponentManager; +exports.Connection = Connection; +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.Extensions = Extensions; exports.Field = Field; +exports.FieldAngle = FieldAngle; exports.FieldCheckbox = FieldCheckbox; exports.FieldColour = FieldColour; exports.FieldDropdown = FieldDropdown; @@ -455,10 +536,68 @@ 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.Icon = Icon; +exports.Input = Input; +exports.InsertionMarkerManager = InsertionMarkerManager; exports.Marker = Marker; +exports.MarkerManager = MarkerManager; +exports.Menu = Menu; +exports.MenuItem = MenuItem; +exports.MetricsManager = MetricsManager; +exports.Mutator = Mutator; +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.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.browserEvents = browserEvents; +exports.bumpObjects = bumpObjects; +exports.clipboard = clipboard; +exports.common = common; +exports.connectionTypes = connectionTypes; +exports.constants = constants; +exports.dialog = dialog; exports.fieldRegistry = fieldRegistry; +exports.inject = inject; +exports.inputTypes = inputTypes; +exports.registry = registry; +exports.uiPosition = uiPosition; +exports.utils = utils; diff --git a/core/blockly_options.js b/core/blockly_options.js index c9c7b62f9..ef0dffc83 100644 --- a/core/blockly_options.js +++ b/core/blockly_options.js @@ -11,7 +11,6 @@ 'use strict'; goog.module('Blockly.BlocklyOptions'); -goog.module.declareLegacyNamespace(); /** diff --git a/core/browser_events.js b/core/browser_events.js index 6bad8bcc9..2d70dcf0a 100644 --- a/core/browser_events.js +++ b/core/browser_events.js @@ -11,7 +11,6 @@ 'use strict'; goog.module('Blockly.browserEvents'); -goog.module.declareLegacyNamespace(); const Touch = goog.require('Blockly.Touch'); const {globalThis} = goog.require('Blockly.utils.global'); diff --git a/core/bubble.js b/core/bubble.js index ad72c9e9b..a4581cdb9 100644 --- a/core/bubble.js +++ b/core/bubble.js @@ -11,7 +11,6 @@ 'use strict'; goog.module('Blockly.Bubble'); -goog.module.declareLegacyNamespace(); const Coordinate = goog.require('Blockly.utils.Coordinate'); /* eslint-disable-next-line no-unused-vars */ diff --git a/core/bubble_dragger.js b/core/bubble_dragger.js index 736332f6f..c6e87ea9e 100644 --- a/core/bubble_dragger.js +++ b/core/bubble_dragger.js @@ -11,7 +11,6 @@ 'use strict'; goog.module('Blockly.BubbleDragger'); -goog.module.declareLegacyNamespace(); const ComponentManager = goog.require('Blockly.ComponentManager'); const Coordinate = goog.require('Blockly.utils.Coordinate'); diff --git a/core/clipboard.js b/core/clipboard.js index 56e0cbeab..4c7205cac 100644 --- a/core/clipboard.js +++ b/core/clipboard.js @@ -11,7 +11,6 @@ 'use strict'; goog.module('Blockly.clipboard'); -goog.module.declareLegacyNamespace(); const Events = goog.require('Blockly.Events'); /* eslint-disable-next-line no-unused-vars */ diff --git a/core/comment.js b/core/comment.js index 6c7d050f6..76a9f08d3 100644 --- a/core/comment.js +++ b/core/comment.js @@ -11,7 +11,6 @@ 'use strict'; goog.module('Blockly.Comment'); -goog.module.declareLegacyNamespace(); const Bubble = goog.require('Blockly.Bubble'); /* eslint-disable-next-line no-unused-vars */ diff --git a/core/common.js b/core/common.js index edc2ab6ce..85f611f6e 100644 --- a/core/common.js +++ b/core/common.js @@ -12,7 +12,6 @@ 'use strict'; goog.module('Blockly.common'); -goog.module.declareLegacyNamespace(); /* eslint-disable-next-line no-unused-vars */ const Connection = goog.requireType('Blockly.Connection'); diff --git a/core/component_manager.js b/core/component_manager.js index dfe48b1be..33c7e6784 100644 --- a/core/component_manager.js +++ b/core/component_manager.js @@ -12,7 +12,6 @@ 'use strict'; goog.module('Blockly.ComponentManager'); -goog.module.declareLegacyNamespace(); /* eslint-disable-next-line no-unused-vars */ const IAutoHideable = goog.requireType('Blockly.IAutoHideable'); diff --git a/core/connection.js b/core/connection.js index fc01edebc..7bb7bb961 100644 --- a/core/connection.js +++ b/core/connection.js @@ -11,7 +11,6 @@ 'use strict'; goog.module('Blockly.Connection'); -goog.module.declareLegacyNamespace(); const Events = goog.require('Blockly.Events'); /* eslint-disable-next-line no-unused-vars */ diff --git a/core/connection_checker.js b/core/connection_checker.js index e3fbc1929..96a07048a 100644 --- a/core/connection_checker.js +++ b/core/connection_checker.js @@ -12,7 +12,6 @@ 'use strict'; goog.module('Blockly.ConnectionChecker'); -goog.module.declareLegacyNamespace(); const Connection = goog.require('Blockly.Connection'); /* eslint-disable-next-line no-unused-vars */ diff --git a/core/connection_db.js b/core/connection_db.js index c0ee7f500..579d36164 100644 --- a/core/connection_db.js +++ b/core/connection_db.js @@ -13,7 +13,6 @@ 'use strict'; goog.module('Blockly.ConnectionDB'); -goog.module.declareLegacyNamespace(); /* eslint-disable-next-line no-unused-vars */ const Coordinate = goog.requireType('Blockly.utils.Coordinate'); diff --git a/core/connection_types.js b/core/connection_types.js index 569ffc442..007e3f5c1 100644 --- a/core/connection_types.js +++ b/core/connection_types.js @@ -12,7 +12,6 @@ 'use strict'; goog.module('Blockly.connectionTypes'); -goog.module.declareLegacyNamespace(); /** * Enum for the type of a connection or input. diff --git a/core/constants.js b/core/constants.js index 727e42a1f..3a247c17f 100644 --- a/core/constants.js +++ b/core/constants.js @@ -11,7 +11,6 @@ 'use strict'; goog.module('Blockly.constants'); -goog.module.declareLegacyNamespace(); /** diff --git a/core/contextmenu.js b/core/contextmenu.js index 5afc69172..6f4deb922 100644 --- a/core/contextmenu.js +++ b/core/contextmenu.js @@ -11,10 +11,7 @@ 'use strict'; goog.module('Blockly.ContextMenu'); -goog.module.declareLegacyNamespace(); -// TODO(#5073): Add Blockly require after fixing circular dependency. -// goog.require('Blockly'); /* eslint-disable-next-line no-unused-vars */ const WorkspaceSvg = goog.requireType('Blockly.WorkspaceSvg'); const Coordinate = goog.require('Blockly.utils.Coordinate'); diff --git a/core/contextmenu_items.js b/core/contextmenu_items.js index 3e32c2ca0..ac2fb56df 100644 --- a/core/contextmenu_items.js +++ b/core/contextmenu_items.js @@ -11,7 +11,6 @@ 'use strict'; goog.module('Blockly.ContextMenuItems'); -goog.module.declareLegacyNamespace(); const ContextMenuRegistry = goog.require('Blockly.ContextMenuRegistry'); const Events = goog.require('Blockly.Events'); diff --git a/core/contextmenu_registry.js b/core/contextmenu_registry.js index 918a11bd6..48daec7f6 100644 --- a/core/contextmenu_registry.js +++ b/core/contextmenu_registry.js @@ -15,7 +15,6 @@ * @namespace */ goog.module('Blockly.ContextMenuRegistry'); -goog.module.declareLegacyNamespace(); /* eslint-disable-next-line no-unused-vars */ const WorkspaceSvg = goog.requireType('Blockly.WorkspaceSvg'); diff --git a/core/css.js b/core/css.js index 519feac09..0e0b7fa5f 100644 --- a/core/css.js +++ b/core/css.js @@ -15,7 +15,6 @@ * @namespace */ goog.module('Blockly.Css'); -goog.module.declareLegacyNamespace(); /** diff --git a/core/delete_area.js b/core/delete_area.js index 9ca08bc7b..67e22d685 100644 --- a/core/delete_area.js +++ b/core/delete_area.js @@ -13,7 +13,6 @@ 'use strict'; goog.module('Blockly.DeleteArea'); -goog.module.declareLegacyNamespace(); const DragTarget = goog.require('Blockly.DragTarget'); /* eslint-disable-next-line no-unused-vars */ diff --git a/core/dialog.js b/core/dialog.js index 7235b6f94..fe387065a 100644 --- a/core/dialog.js +++ b/core/dialog.js @@ -12,7 +12,6 @@ 'use strict'; goog.module('Blockly.dialog'); -goog.module.declareLegacyNamespace(); let alertImplementation = function(message, opt_callback) { window.alert(message); diff --git a/core/drag_target.js b/core/drag_target.js index e5a0f578b..daec4cf89 100644 --- a/core/drag_target.js +++ b/core/drag_target.js @@ -13,7 +13,6 @@ 'use strict'; goog.module('Blockly.DragTarget'); -goog.module.declareLegacyNamespace(); /* eslint-disable-next-line no-unused-vars */ const IDragTarget = goog.requireType('Blockly.IDragTarget'); diff --git a/core/dropdowndiv.js b/core/dropdowndiv.js index b9d814891..c5517bf3e 100644 --- a/core/dropdowndiv.js +++ b/core/dropdowndiv.js @@ -14,7 +14,6 @@ 'use strict'; goog.module('Blockly.DropDownDiv'); -goog.module.declareLegacyNamespace(); const Rect = goog.require('Blockly.utils.Rect'); /* eslint-disable-next-line no-unused-vars */ diff --git a/core/extensions.js b/core/extensions.js index f956bfed5..876169ff0 100644 --- a/core/extensions.js +++ b/core/extensions.js @@ -18,7 +18,6 @@ * @namespace */ goog.module('Blockly.Extensions'); -goog.module.declareLegacyNamespace(); const utils = goog.require('Blockly.utils'); /* eslint-disable-next-line no-unused-vars */ diff --git a/core/field_angle.js b/core/field_angle.js index ab4295a40..657adfd6d 100644 --- a/core/field_angle.js +++ b/core/field_angle.js @@ -11,7 +11,6 @@ 'use strict'; goog.module('Blockly.FieldAngle'); -goog.module.declareLegacyNamespace(); const Css = goog.require('Blockly.Css'); const DropDownDiv = goog.require('Blockly.DropDownDiv'); diff --git a/core/flyout_base.js b/core/flyout_base.js index c4d1832a0..73e3c9dc1 100644 --- a/core/flyout_base.js +++ b/core/flyout_base.js @@ -11,7 +11,6 @@ 'use strict'; goog.module('Blockly.Flyout'); -goog.module.declareLegacyNamespace(); const ComponentManager = goog.require('Blockly.ComponentManager'); const Coordinate = goog.require('Blockly.utils.Coordinate'); diff --git a/core/flyout_button.js b/core/flyout_button.js index 7bb5a3e88..50f101f5a 100644 --- a/core/flyout_button.js +++ b/core/flyout_button.js @@ -11,7 +11,6 @@ 'use strict'; goog.module('Blockly.FlyoutButton'); -goog.module.declareLegacyNamespace(); const Coordinate = goog.require('Blockly.utils.Coordinate'); const Css = goog.require('Blockly.Css'); diff --git a/core/flyout_horizontal.js b/core/flyout_horizontal.js index f7c4e9e74..877b13840 100644 --- a/core/flyout_horizontal.js +++ b/core/flyout_horizontal.js @@ -11,7 +11,6 @@ 'use strict'; goog.module('Blockly.HorizontalFlyout'); -goog.module.declareLegacyNamespace(); /* eslint-disable-next-line no-unused-vars */ const Coordinate = goog.requireType('Blockly.utils.Coordinate'); diff --git a/core/flyout_metrics_manager.js b/core/flyout_metrics_manager.js index b3ed243d6..dde699902 100644 --- a/core/flyout_metrics_manager.js +++ b/core/flyout_metrics_manager.js @@ -11,7 +11,6 @@ 'use strict'; goog.module('Blockly.FlyoutMetricsManager'); -goog.module.declareLegacyNamespace(); /* eslint-disable-next-line no-unused-vars */ const IFlyout = goog.requireType('Blockly.IFlyout'); diff --git a/core/flyout_vertical.js b/core/flyout_vertical.js index edd8541f0..b201ebeac 100644 --- a/core/flyout_vertical.js +++ b/core/flyout_vertical.js @@ -11,7 +11,6 @@ 'use strict'; goog.module('Blockly.VerticalFlyout'); -goog.module.declareLegacyNamespace(); /* eslint-disable-next-line no-unused-vars */ const Coordinate = goog.requireType('Blockly.utils.Coordinate'); diff --git a/core/generator.js b/core/generator.js index ed7e20329..d121bb186 100644 --- a/core/generator.js +++ b/core/generator.js @@ -12,7 +12,6 @@ 'use strict'; goog.module('Blockly.Generator'); -goog.module.declareLegacyNamespace(); /* eslint-disable-next-line no-unused-vars */ const Names = goog.requireType('Blockly.Names'); diff --git a/core/gesture.js b/core/gesture.js index 077e14788..f2352050e 100644 --- a/core/gesture.js +++ b/core/gesture.js @@ -12,7 +12,6 @@ 'use strict'; goog.module('Blockly.Gesture'); -goog.module.declareLegacyNamespace(); const BubbleDragger = goog.require('Blockly.BubbleDragger'); const Coordinate = goog.require('Blockly.utils.Coordinate'); diff --git a/core/grid.js b/core/grid.js index 1a1d5f2a3..9865364a2 100644 --- a/core/grid.js +++ b/core/grid.js @@ -12,7 +12,6 @@ 'use strict'; goog.module('Blockly.Grid'); -goog.module.declareLegacyNamespace(); const Svg = goog.require('Blockly.utils.Svg'); const dom = goog.require('Blockly.utils.dom'); diff --git a/core/icon.js b/core/icon.js index 83dbaf583..3fd8ccaf0 100644 --- a/core/icon.js +++ b/core/icon.js @@ -11,7 +11,6 @@ 'use strict'; goog.module('Blockly.Icon'); -goog.module.declareLegacyNamespace(); /* eslint-disable-next-line no-unused-vars */ const Bubble = goog.requireType('Blockly.Bubble'); diff --git a/core/inject.js b/core/inject.js index dadfd50d0..4fedf8527 100644 --- a/core/inject.js +++ b/core/inject.js @@ -11,7 +11,6 @@ 'use strict'; goog.module('Blockly.inject'); -goog.module.declareLegacyNamespace(); /* eslint-disable-next-line no-unused-vars */ const BlocklyOptions = goog.requireType('Blockly.BlocklyOptions'); diff --git a/core/input.js b/core/input.js index 04dda6620..5d503ff04 100644 --- a/core/input.js +++ b/core/input.js @@ -11,7 +11,6 @@ 'use strict'; goog.module('Blockly.Input'); -goog.module.declareLegacyNamespace(); /* eslint-disable-next-line no-unused-vars */ const Connection = goog.requireType('Blockly.Connection'); diff --git a/core/input_types.js b/core/input_types.js index 8bdc9e504..28f40578a 100644 --- a/core/input_types.js +++ b/core/input_types.js @@ -12,7 +12,6 @@ 'use strict'; goog.module('Blockly.inputTypes'); -goog.module.declareLegacyNamespace(); const connectionTypes = goog.require('Blockly.connectionTypes'); diff --git a/core/insertion_marker_manager.js b/core/insertion_marker_manager.js index bc4c2f311..28d975edc 100644 --- a/core/insertion_marker_manager.js +++ b/core/insertion_marker_manager.js @@ -11,10 +11,7 @@ 'use strict'; goog.module('Blockly.InsertionMarkerManager'); -goog.module.declareLegacyNamespace(); -// TODO(#5073): Add Blockly require after fixing circular dependency. -// goog.require('Blockly'); const ComponentManager = goog.require('Blockly.ComponentManager'); /* eslint-disable-next-line no-unused-vars */ const Coordinate = goog.requireType('Blockly.utils.Coordinate'); diff --git a/core/internal_constants.js b/core/internal_constants.js index b97c723b4..c7028c303 100644 --- a/core/internal_constants.js +++ b/core/internal_constants.js @@ -13,7 +13,6 @@ 'use strict'; goog.module('Blockly.internalConstants'); -goog.module.declareLegacyNamespace(); const connectionTypes = goog.require('Blockly.connectionTypes'); diff --git a/core/marker_manager.js b/core/marker_manager.js index 0857e9260..f26365e0e 100644 --- a/core/marker_manager.js +++ b/core/marker_manager.js @@ -11,7 +11,6 @@ 'use strict'; goog.module('Blockly.MarkerManager'); -goog.module.declareLegacyNamespace(); /* eslint-disable-next-line no-unused-vars */ const WorkspaceSvg = goog.requireType('Blockly.WorkspaceSvg'); diff --git a/core/menu.js b/core/menu.js index 91cfb4d36..a142d341a 100644 --- a/core/menu.js +++ b/core/menu.js @@ -11,7 +11,6 @@ 'use strict'; goog.module('Blockly.Menu'); -goog.module.declareLegacyNamespace(); const Coordinate = goog.require('Blockly.utils.Coordinate'); /* eslint-disable-next-line no-unused-vars */ diff --git a/core/menuitem.js b/core/menuitem.js index b06ca83f8..a34148836 100644 --- a/core/menuitem.js +++ b/core/menuitem.js @@ -11,7 +11,6 @@ 'use strict'; goog.module('Blockly.MenuItem'); -goog.module.declareLegacyNamespace(); const aria = goog.require('Blockly.utils.aria'); const dom = goog.require('Blockly.utils.dom'); diff --git a/core/metrics_manager.js b/core/metrics_manager.js index 04643d74a..6331867af 100644 --- a/core/metrics_manager.js +++ b/core/metrics_manager.js @@ -11,7 +11,6 @@ 'use strict'; goog.module('Blockly.MetricsManager'); -goog.module.declareLegacyNamespace(); /* eslint-disable-next-line no-unused-vars */ const IFlyout = goog.requireType('Blockly.IFlyout'); diff --git a/core/mutator.js b/core/mutator.js index a00d279e9..0ab65c5aa 100644 --- a/core/mutator.js +++ b/core/mutator.js @@ -12,7 +12,6 @@ 'use strict'; goog.module('Blockly.Mutator'); -goog.module.declareLegacyNamespace(); /* eslint-disable-next-line no-unused-vars */ const Abstract = goog.requireType('Blockly.Events.Abstract'); diff --git a/core/names.js b/core/names.js index b66da4c37..099d2972d 100644 --- a/core/names.js +++ b/core/names.js @@ -11,7 +11,6 @@ 'use strict'; goog.module('Blockly.Names'); -goog.module.declareLegacyNamespace(); const Msg = goog.require('Blockly.Msg'); /* eslint-disable-next-line no-unused-vars */ diff --git a/core/options.js b/core/options.js index cc2d412ef..75eba6956 100644 --- a/core/options.js +++ b/core/options.js @@ -11,7 +11,6 @@ 'use strict'; goog.module('Blockly.Options'); -goog.module.declareLegacyNamespace(); /* eslint-disable-next-line no-unused-vars */ const BlocklyOptions = goog.requireType('Blockly.BlocklyOptions'); diff --git a/core/positionable_helpers.js b/core/positionable_helpers.js index 812c5f7be..aa5bb8fcb 100644 --- a/core/positionable_helpers.js +++ b/core/positionable_helpers.js @@ -11,7 +11,6 @@ 'use strict'; goog.module('Blockly.uiPosition'); -goog.module.declareLegacyNamespace(); /* eslint-disable-next-line no-unused-vars */ const MetricsManager = goog.requireType('Blockly.MetricsManager'); diff --git a/core/procedures.js b/core/procedures.js index eec3484fd..e80f04b5b 100644 --- a/core/procedures.js +++ b/core/procedures.js @@ -15,7 +15,6 @@ * @namespace */ goog.module('Blockly.Procedures'); -goog.module.declareLegacyNamespace(); /* eslint-disable-next-line no-unused-vars */ const Abstract = goog.requireType('Blockly.Events.Abstract'); diff --git a/core/registry.js b/core/registry.js index 1a03f715e..99f2e4e8b 100644 --- a/core/registry.js +++ b/core/registry.js @@ -12,7 +12,6 @@ 'use strict'; goog.module('Blockly.registry'); -goog.module.declareLegacyNamespace(); /* eslint-disable-next-line no-unused-vars */ const Abstract = goog.requireType('Blockly.Events.Abstract'); diff --git a/core/rendered_connection.js b/core/rendered_connection.js index 974093b71..f9f5b425d 100644 --- a/core/rendered_connection.js +++ b/core/rendered_connection.js @@ -11,7 +11,6 @@ 'use strict'; goog.module('Blockly.RenderedConnection'); -goog.module.declareLegacyNamespace(); const Connection = goog.require('Blockly.Connection'); /* eslint-disable-next-line no-unused-vars */ diff --git a/core/scrollbar.js b/core/scrollbar.js index 4de7ecbff..8eb521bc2 100644 --- a/core/scrollbar.js +++ b/core/scrollbar.js @@ -11,10 +11,7 @@ 'use strict'; goog.module('Blockly.Scrollbar'); -goog.module.declareLegacyNamespace(); -// TODO(#5073): Add Blockly require after fixing circular dependency. -// goog.require('Blockly'); const Touch = goog.require('Blockly.Touch'); const Coordinate = goog.require('Blockly.utils.Coordinate'); /* eslint-disable-next-line no-unused-vars */ diff --git a/core/scrollbar_pair.js b/core/scrollbar_pair.js index 2b240f276..2e79f1f98 100644 --- a/core/scrollbar_pair.js +++ b/core/scrollbar_pair.js @@ -11,7 +11,6 @@ 'use strict'; goog.module('Blockly.ScrollbarPair'); -goog.module.declareLegacyNamespace(); const Events = goog.require('Blockly.Events'); /* eslint-disable-next-line no-unused-vars */ diff --git a/core/shortcut_items.js b/core/shortcut_items.js index 45e48eb88..41cbc85a7 100644 --- a/core/shortcut_items.js +++ b/core/shortcut_items.js @@ -11,7 +11,6 @@ 'use strict'; goog.module('Blockly.ShortcutItems'); -goog.module.declareLegacyNamespace(); const Gesture = goog.require('Blockly.Gesture'); /* eslint-disable-next-line no-unused-vars */ diff --git a/core/shortcut_registry.js b/core/shortcut_registry.js index 3da777eae..d72a2c46c 100644 --- a/core/shortcut_registry.js +++ b/core/shortcut_registry.js @@ -12,7 +12,6 @@ 'use strict'; goog.module('Blockly.ShortcutRegistry'); -goog.module.declareLegacyNamespace(); const KeyCodes = goog.require('Blockly.utils.KeyCodes'); /* eslint-disable-next-line no-unused-vars */ diff --git a/core/theme.js b/core/theme.js index 11c72e491..ce3b02e6d 100644 --- a/core/theme.js +++ b/core/theme.js @@ -10,7 +10,6 @@ 'use strict'; goog.module('Blockly.Theme'); -goog.module.declareLegacyNamespace(); const object = goog.require('Blockly.utils.object'); const registry = goog.require('Blockly.registry'); diff --git a/core/theme_manager.js b/core/theme_manager.js index 308bc9088..4e95b0d9f 100644 --- a/core/theme_manager.js +++ b/core/theme_manager.js @@ -13,7 +13,6 @@ 'use strict'; goog.module('Blockly.ThemeManager'); -goog.module.declareLegacyNamespace(); /* eslint-disable-next-line no-unused-vars */ const Theme = goog.requireType('Blockly.Theme'); diff --git a/core/tooltip.js b/core/tooltip.js index d0335556b..4a659d918 100644 --- a/core/tooltip.js +++ b/core/tooltip.js @@ -20,7 +20,6 @@ * @namespace */ goog.module('Blockly.Tooltip'); -goog.module.declareLegacyNamespace(); const blocklyString = goog.require('Blockly.utils.string'); const browserEvents = goog.require('Blockly.browserEvents'); diff --git a/core/touch.js b/core/touch.js index f17667fff..ce2b51b2b 100644 --- a/core/touch.js +++ b/core/touch.js @@ -11,7 +11,6 @@ 'use strict'; goog.module('Blockly.Touch'); -goog.module.declareLegacyNamespace(); /* eslint-disable-next-line no-unused-vars */ const Gesture = goog.requireType('Blockly.Gesture'); diff --git a/core/touch_gesture.js b/core/touch_gesture.js index 131ce725c..f7b89ff60 100644 --- a/core/touch_gesture.js +++ b/core/touch_gesture.js @@ -12,7 +12,6 @@ 'use strict'; goog.module('Blockly.TouchGesture'); -goog.module.declareLegacyNamespace(); const Coordinate = goog.require('Blockly.utils.Coordinate'); const Gesture = goog.require('Blockly.Gesture'); diff --git a/core/trashcan.js b/core/trashcan.js index a0c4e71e9..bebc5569d 100644 --- a/core/trashcan.js +++ b/core/trashcan.js @@ -11,7 +11,6 @@ 'use strict'; goog.module('Blockly.Trashcan'); -goog.module.declareLegacyNamespace(); /* eslint-disable-next-line no-unused-vars */ const Abstract = goog.requireType('Blockly.Events.Abstract'); diff --git a/core/utils.js b/core/utils.js index 2c80c6b08..a1a4d1c89 100644 --- a/core/utils.js +++ b/core/utils.js @@ -17,7 +17,6 @@ * @namespace */ goog.module('Blockly.utils'); -goog.module.declareLegacyNamespace(); const Coordinate = goog.require('Blockly.utils.Coordinate'); const KeyCodes = goog.require('Blockly.utils.KeyCodes'); diff --git a/core/variable_map.js b/core/variable_map.js index 3725df516..fb831d293 100644 --- a/core/variable_map.js +++ b/core/variable_map.js @@ -11,7 +11,6 @@ 'use strict'; goog.module('Blockly.VariableMap'); -goog.module.declareLegacyNamespace(); const Events = goog.require('Blockly.Events'); const Msg = goog.require('Blockly.Msg'); diff --git a/core/variable_model.js b/core/variable_model.js index f8ad7c6e3..dcded7131 100644 --- a/core/variable_model.js +++ b/core/variable_model.js @@ -11,7 +11,6 @@ 'use strict'; goog.module('Blockly.VariableModel'); -goog.module.declareLegacyNamespace(); const Events = goog.require('Blockly.Events'); /* eslint-disable-next-line no-unused-vars */ diff --git a/core/variables.js b/core/variables.js index 575793105..5b83620d8 100644 --- a/core/variables.js +++ b/core/variables.js @@ -15,7 +15,6 @@ * @namespace */ goog.module('Blockly.Variables'); -goog.module.declareLegacyNamespace(); const Blocks = goog.require('Blockly.Blocks'); const Msg = goog.require('Blockly.Msg'); diff --git a/core/variables_dynamic.js b/core/variables_dynamic.js index e982d733e..64969b85c 100644 --- a/core/variables_dynamic.js +++ b/core/variables_dynamic.js @@ -12,7 +12,6 @@ 'use strict'; goog.module('Blockly.VariablesDynamic'); -goog.module.declareLegacyNamespace(); const Blocks = goog.require('Blockly.Blocks'); const Msg = goog.require('Blockly.Msg'); diff --git a/core/warning.js b/core/warning.js index debd9d529..bf137f8d5 100644 --- a/core/warning.js +++ b/core/warning.js @@ -11,7 +11,6 @@ 'use strict'; goog.module('Blockly.Warning'); -goog.module.declareLegacyNamespace(); const Bubble = goog.require('Blockly.Bubble'); /* eslint-disable-next-line no-unused-vars */ diff --git a/core/widgetdiv.js b/core/widgetdiv.js index fabd521af..571cfe277 100644 --- a/core/widgetdiv.js +++ b/core/widgetdiv.js @@ -17,7 +17,6 @@ * @namespace */ goog.module('Blockly.WidgetDiv'); -goog.module.declareLegacyNamespace(); /* eslint-disable-next-line no-unused-vars */ const Rect = goog.requireType('Blockly.utils.Rect'); diff --git a/core/workspace.js b/core/workspace.js index 2b844d5cc..dc2d26efc 100644 --- a/core/workspace.js +++ b/core/workspace.js @@ -11,7 +11,6 @@ 'use strict'; goog.module('Blockly.Workspace'); -goog.module.declareLegacyNamespace(); /* eslint-disable-next-line no-unused-vars */ const Abstract = goog.requireType('Blockly.Events.Abstract'); diff --git a/core/workspace_audio.js b/core/workspace_audio.js index 178657baf..94c5bd06d 100644 --- a/core/workspace_audio.js +++ b/core/workspace_audio.js @@ -12,7 +12,6 @@ 'use strict'; goog.module('Blockly.WorkspaceAudio'); -goog.module.declareLegacyNamespace(); /* eslint-disable-next-line no-unused-vars */ const WorkspaceSvg = goog.requireType('Blockly.WorkspaceSvg'); diff --git a/core/workspace_comment.js b/core/workspace_comment.js index 0f5f981e2..a2a2aecaf 100644 --- a/core/workspace_comment.js +++ b/core/workspace_comment.js @@ -11,7 +11,6 @@ 'use strict'; goog.module('Blockly.WorkspaceComment'); -goog.module.declareLegacyNamespace(); const Coordinate = goog.require('Blockly.utils.Coordinate'); const Events = goog.require('Blockly.Events'); diff --git a/core/workspace_comment_svg.js b/core/workspace_comment_svg.js index 3e4dc288b..1e8172948 100644 --- a/core/workspace_comment_svg.js +++ b/core/workspace_comment_svg.js @@ -11,7 +11,6 @@ 'use strict'; goog.module('Blockly.WorkspaceCommentSvg'); -goog.module.declareLegacyNamespace(); const ContextMenu = goog.require('Blockly.ContextMenu'); const Coordinate = goog.require('Blockly.utils.Coordinate'); diff --git a/core/workspace_drag_surface_svg.js b/core/workspace_drag_surface_svg.js index 8cffb37d6..5b12d4a68 100644 --- a/core/workspace_drag_surface_svg.js +++ b/core/workspace_drag_surface_svg.js @@ -15,7 +15,6 @@ 'use strict'; goog.module('Blockly.WorkspaceDragSurfaceSvg'); -goog.module.declareLegacyNamespace(); /* eslint-disable-next-line no-unused-vars */ const Coordinate = goog.requireType('Blockly.utils.Coordinate'); diff --git a/core/workspace_dragger.js b/core/workspace_dragger.js index edce50701..92e3f0060 100644 --- a/core/workspace_dragger.js +++ b/core/workspace_dragger.js @@ -11,10 +11,7 @@ 'use strict'; goog.module('Blockly.WorkspaceDragger'); -goog.module.declareLegacyNamespace(); -// TODO(#5073): Add Blockly require after fixing circular dependency. -// goog.require('Blockly'); const Coordinate = goog.require('Blockly.utils.Coordinate'); /* eslint-disable-next-line no-unused-vars */ const WorkspaceSvg = goog.requireType('Blockly.WorkspaceSvg'); diff --git a/core/workspace_svg.js b/core/workspace_svg.js index 2dd0dc5eb..12471ef95 100644 --- a/core/workspace_svg.js +++ b/core/workspace_svg.js @@ -11,7 +11,6 @@ 'use strict'; goog.module('Blockly.WorkspaceSvg'); -goog.module.declareLegacyNamespace(); /* eslint-disable-next-line no-unused-vars */ const BlocklyOptions = goog.requireType('Blockly.BlocklyOptions'); diff --git a/core/xml.js b/core/xml.js index c6a14f491..19bc142ca 100644 --- a/core/xml.js +++ b/core/xml.js @@ -11,7 +11,6 @@ 'use strict'; goog.module('Blockly.Xml'); -goog.module.declareLegacyNamespace(); const Events = goog.require('Blockly.Events'); /* eslint-disable-next-line no-unused-vars */ diff --git a/core/zoom_controls.js b/core/zoom_controls.js index 5919c9578..ec3ddaf42 100644 --- a/core/zoom_controls.js +++ b/core/zoom_controls.js @@ -11,7 +11,6 @@ 'use strict'; goog.module('Blockly.ZoomControls'); -goog.module.declareLegacyNamespace(); const ComponentManager = goog.require('Blockly.ComponentManager'); const Css = goog.require('Blockly.Css'); diff --git a/tests/deps.js b/tests/deps.js index 91bf8ec17..9be60d8d7 100644 --- a/tests/deps.js +++ b/tests/deps.js @@ -12,7 +12,7 @@ goog.addDependency('../../core/block_animations.js', ['Blockly.blockAnimations'] goog.addDependency('../../core/block_drag_surface.js', ['Blockly.BlockDragSurfaceSvg'], ['Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'}); goog.addDependency('../../core/block_dragger.js', ['Blockly.BlockDragger'], ['Blockly.Events', 'Blockly.Events.BlockDrag', 'Blockly.Events.BlockMove', 'Blockly.InsertionMarkerManager', 'Blockly.blockAnimations', 'Blockly.bumpObjects', 'Blockly.common', 'Blockly.registry', 'Blockly.utils.Coordinate', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'}); goog.addDependency('../../core/block_svg.js', ['Blockly.BlockSvg'], ['Blockly.ASTNode', 'Blockly.Block', 'Blockly.ContextMenu', 'Blockly.ContextMenuRegistry', 'Blockly.Events', 'Blockly.Events.BlockMove', 'Blockly.Events.Selected', 'Blockly.FieldLabel', 'Blockly.MarkerManager', 'Blockly.Msg', 'Blockly.RenderedConnection', 'Blockly.TabNavigateCursor', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.blockAnimations', 'Blockly.browserEvents', 'Blockly.common', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.internalConstants', 'Blockly.serialization.blocks', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Rect', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'}); -goog.addDependency('../../core/blockly.js', ['Blockly'], ['Blockly.ASTNode', 'Blockly.BasicCursor', 'Blockly.Block', 'Blockly.BlockDragSurfaceSvg', 'Blockly.BlockDragger', 'Blockly.BlockSvg', 'Blockly.Blocks', 'Blockly.CollapsibleToolboxCategory', 'Blockly.Cursor', 'Blockly.Events.BlockCreate', 'Blockly.Events.FinishedLoading', 'Blockly.Events.Ui', 'Blockly.Events.UiBase', 'Blockly.Events.VarCreate', 'Blockly.Field', 'Blockly.FieldCheckbox', 'Blockly.FieldColour', 'Blockly.FieldDropdown', 'Blockly.FieldImage', 'Blockly.FieldLabel', 'Blockly.FieldLabelSerializable', 'Blockly.FieldMultilineInput', 'Blockly.FieldNumber', 'Blockly.FieldTextInput', 'Blockly.FieldVariable', 'Blockly.Marker', 'Blockly.Procedures', 'Blockly.TabNavigateCursor', 'Blockly.Toolbox', 'Blockly.ToolboxCategory', 'Blockly.ToolboxItem', 'Blockly.ToolboxSeparator', 'Blockly.Touch', 'Blockly.Variables', 'Blockly.Xml', 'Blockly.browserEvents', 'Blockly.clipboard', 'Blockly.common', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.dialog', 'Blockly.fieldRegistry', 'Blockly.inject', 'Blockly.inputTypes', 'Blockly.internalConstants', 'Blockly.utils.Size', 'Blockly.utils.colour', 'Blockly.utils.deprecation', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'}); +goog.addDependency('../../core/blockly.js', ['Blockly'], ['Blockly.ASTNode', 'Blockly.BasicCursor', 'Blockly.Block', 'Blockly.BlockDragSurfaceSvg', 'Blockly.BlockDragger', 'Blockly.BlockSvg', 'Blockly.BlocklyOptions', 'Blockly.Blocks', 'Blockly.Bubble', 'Blockly.BubbleDragger', 'Blockly.CollapsibleToolboxCategory', 'Blockly.Comment', 'Blockly.ComponentManager', 'Blockly.Connection', 'Blockly.ConnectionChecker', 'Blockly.ConnectionDB', 'Blockly.ContextMenu', 'Blockly.ContextMenuItems', 'Blockly.ContextMenuRegistry', 'Blockly.Css', 'Blockly.Cursor', 'Blockly.DeleteArea', 'Blockly.DragTarget', 'Blockly.DropDownDiv', 'Blockly.Events.BlockCreate', 'Blockly.Events.FinishedLoading', 'Blockly.Events.Ui', 'Blockly.Events.UiBase', 'Blockly.Events.VarCreate', 'Blockly.Extensions', 'Blockly.Field', 'Blockly.FieldAngle', 'Blockly.FieldCheckbox', 'Blockly.FieldColour', 'Blockly.FieldDropdown', 'Blockly.FieldImage', 'Blockly.FieldLabel', 'Blockly.FieldLabelSerializable', 'Blockly.FieldMultilineInput', 'Blockly.FieldNumber', 'Blockly.FieldTextInput', 'Blockly.FieldVariable', 'Blockly.Flyout', 'Blockly.FlyoutButton', 'Blockly.FlyoutMetricsManager', 'Blockly.Generator', 'Blockly.Gesture', 'Blockly.Grid', 'Blockly.HorizontalFlyout', 'Blockly.Icon', 'Blockly.Input', 'Blockly.InsertionMarkerManager', 'Blockly.Marker', 'Blockly.MarkerManager', 'Blockly.Menu', 'Blockly.MenuItem', 'Blockly.MetricsManager', 'Blockly.Mutator', 'Blockly.Names', 'Blockly.Options', 'Blockly.Procedures', 'Blockly.Procedures', 'Blockly.RenderedConnection', 'Blockly.Scrollbar', 'Blockly.ScrollbarPair', 'Blockly.ShortcutItems', 'Blockly.ShortcutRegistry', 'Blockly.TabNavigateCursor', 'Blockly.Theme', 'Blockly.ThemeManager', 'Blockly.Toolbox', 'Blockly.ToolboxCategory', 'Blockly.ToolboxItem', 'Blockly.ToolboxSeparator', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.Touch', 'Blockly.TouchGesture', 'Blockly.Trashcan', 'Blockly.VariableMap', 'Blockly.VariableModel', 'Blockly.Variables', 'Blockly.Variables', 'Blockly.VariablesDynamic', 'Blockly.VerticalFlyout', 'Blockly.Warning', 'Blockly.WidgetDiv', 'Blockly.Workspace', 'Blockly.WorkspaceAudio', 'Blockly.WorkspaceComment', 'Blockly.WorkspaceCommentSvg', 'Blockly.WorkspaceDragSurfaceSvg', 'Blockly.WorkspaceDragger', 'Blockly.WorkspaceSvg', 'Blockly.Xml', 'Blockly.Xml', 'Blockly.ZoomControls', 'Blockly.blockAnimations', 'Blockly.browserEvents', 'Blockly.bumpObjects', 'Blockly.clipboard', 'Blockly.common', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.dialog', 'Blockly.fieldRegistry', 'Blockly.inject', 'Blockly.inject', 'Blockly.inputTypes', 'Blockly.internalConstants', 'Blockly.registry', 'Blockly.uiPosition', 'Blockly.utils', 'Blockly.utils.Size', 'Blockly.utils.colour', 'Blockly.utils.deprecation', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'}); goog.addDependency('../../core/blockly_options.js', ['Blockly.BlocklyOptions'], [], {'lang': 'es6', 'module': 'goog'}); goog.addDependency('../../core/blocks.js', ['Blockly.Blocks'], [], {'lang': 'es6', 'module': 'goog'}); goog.addDependency('../../core/browser_events.js', ['Blockly.browserEvents'], ['Blockly.Touch', 'Blockly.internalConstants', 'Blockly.utils.global', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'}); @@ -87,7 +87,7 @@ goog.addDependency('../../core/generator.js', ['Blockly.Generator'], ['Blockly.c goog.addDependency('../../core/gesture.js', ['Blockly.Gesture'], ['Blockly.BlockDragger', 'Blockly.BubbleDragger', 'Blockly.Events', 'Blockly.Events.Click', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.Workspace', 'Blockly.WorkspaceDragger', 'Blockly.blockAnimations', 'Blockly.browserEvents', 'Blockly.common', 'Blockly.internalConstants', 'Blockly.registry', 'Blockly.utils.Coordinate'], {'lang': 'es6', 'module': 'goog'}); goog.addDependency('../../core/grid.js', ['Blockly.Grid'], ['Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'}); goog.addDependency('../../core/icon.js', ['Blockly.Icon'], ['Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'}); -goog.addDependency('../../core/inject.js', ['Blockly.inject'], ['Blockly.BlockDragSurfaceSvg', 'Blockly.Css', 'Blockly.DropDownDiv', 'Blockly.Grid', 'Blockly.Msg', 'Blockly.Options', 'Blockly.ScrollbarPair', 'Blockly.ShortcutRegistry', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.WidgetDiv', 'Blockly.Workspace', 'Blockly.WorkspaceDragSurfaceSvg', 'Blockly.WorkspaceSvg', 'Blockly.browserEvents', 'Blockly.bumpObjects', 'Blockly.common', 'Blockly.utils', 'Blockly.utils.Svg', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'}); +goog.addDependency('../../core/inject.js', ['Blockly.inject'], ['Blockly.BlockDragSurfaceSvg', 'Blockly.Css', 'Blockly.DropDownDiv', 'Blockly.Grid', 'Blockly.Msg', 'Blockly.Options', 'Blockly.ScrollbarPair', 'Blockly.ShortcutRegistry', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.WidgetDiv', 'Blockly.Workspace', 'Blockly.WorkspaceDragSurfaceSvg', 'Blockly.WorkspaceSvg', 'Blockly.browserEvents', 'Blockly.bumpObjects', 'Blockly.common', 'Blockly.utils.Svg', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'}); goog.addDependency('../../core/input.js', ['Blockly.Input'], ['Blockly.FieldLabel', 'Blockly.constants', 'Blockly.fieldRegistry', 'Blockly.inputTypes'], {'lang': 'es6', 'module': 'goog'}); goog.addDependency('../../core/input_types.js', ['Blockly.inputTypes'], ['Blockly.connectionTypes'], {'lang': 'es6', 'module': 'goog'}); goog.addDependency('../../core/insertion_marker_manager.js', ['Blockly.InsertionMarkerManager'], ['Blockly.ComponentManager', 'Blockly.Events', 'Blockly.blockAnimations', 'Blockly.common', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.internalConstants'], {'lang': 'es6', 'module': 'goog'}); diff --git a/tests/deps.mocha.js b/tests/deps.mocha.js index 189f7d09a..61a541b56 100644 --- a/tests/deps.mocha.js +++ b/tests/deps.mocha.js @@ -12,7 +12,7 @@ goog.addDependency('../../core/block_animations.js', ['Blockly.blockAnimations'] goog.addDependency('../../core/block_drag_surface.js', ['Blockly.BlockDragSurfaceSvg'], ['Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'}); goog.addDependency('../../core/block_dragger.js', ['Blockly.BlockDragger'], ['Blockly.Events', 'Blockly.Events.BlockDrag', 'Blockly.Events.BlockMove', 'Blockly.InsertionMarkerManager', 'Blockly.blockAnimations', 'Blockly.bumpObjects', 'Blockly.common', 'Blockly.registry', 'Blockly.utils.Coordinate', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'}); goog.addDependency('../../core/block_svg.js', ['Blockly.BlockSvg'], ['Blockly.ASTNode', 'Blockly.Block', 'Blockly.ContextMenu', 'Blockly.ContextMenuRegistry', 'Blockly.Events', 'Blockly.Events.BlockMove', 'Blockly.Events.Selected', 'Blockly.FieldLabel', 'Blockly.MarkerManager', 'Blockly.Msg', 'Blockly.RenderedConnection', 'Blockly.TabNavigateCursor', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.blockAnimations', 'Blockly.browserEvents', 'Blockly.common', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.internalConstants', 'Blockly.serialization.blocks', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Rect', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'}); -goog.addDependency('../../core/blockly.js', ['Blockly'], ['Blockly.ASTNode', 'Blockly.BasicCursor', 'Blockly.Block', 'Blockly.BlockDragSurfaceSvg', 'Blockly.BlockDragger', 'Blockly.BlockSvg', 'Blockly.Blocks', 'Blockly.CollapsibleToolboxCategory', 'Blockly.Cursor', 'Blockly.Events.BlockCreate', 'Blockly.Events.FinishedLoading', 'Blockly.Events.Ui', 'Blockly.Events.UiBase', 'Blockly.Events.VarCreate', 'Blockly.Field', 'Blockly.FieldCheckbox', 'Blockly.FieldColour', 'Blockly.FieldDropdown', 'Blockly.FieldImage', 'Blockly.FieldLabel', 'Blockly.FieldLabelSerializable', 'Blockly.FieldMultilineInput', 'Blockly.FieldNumber', 'Blockly.FieldTextInput', 'Blockly.FieldVariable', 'Blockly.Marker', 'Blockly.Procedures', 'Blockly.TabNavigateCursor', 'Blockly.Toolbox', 'Blockly.ToolboxCategory', 'Blockly.ToolboxItem', 'Blockly.ToolboxSeparator', 'Blockly.Touch', 'Blockly.Variables', 'Blockly.Xml', 'Blockly.browserEvents', 'Blockly.clipboard', 'Blockly.common', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.dialog', 'Blockly.fieldRegistry', 'Blockly.inject', 'Blockly.inputTypes', 'Blockly.internalConstants', 'Blockly.utils.Size', 'Blockly.utils.colour', 'Blockly.utils.deprecation', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'}); +goog.addDependency('../../core/blockly.js', ['Blockly'], ['Blockly.ASTNode', 'Blockly.BasicCursor', 'Blockly.Block', 'Blockly.BlockDragSurfaceSvg', 'Blockly.BlockDragger', 'Blockly.BlockSvg', 'Blockly.BlocklyOptions', 'Blockly.Blocks', 'Blockly.Bubble', 'Blockly.BubbleDragger', 'Blockly.CollapsibleToolboxCategory', 'Blockly.Comment', 'Blockly.ComponentManager', 'Blockly.Connection', 'Blockly.ConnectionChecker', 'Blockly.ConnectionDB', 'Blockly.ContextMenu', 'Blockly.ContextMenuItems', 'Blockly.ContextMenuRegistry', 'Blockly.Css', 'Blockly.Cursor', 'Blockly.DeleteArea', 'Blockly.DragTarget', 'Blockly.DropDownDiv', 'Blockly.Events.BlockCreate', 'Blockly.Events.FinishedLoading', 'Blockly.Events.Ui', 'Blockly.Events.UiBase', 'Blockly.Events.VarCreate', 'Blockly.Extensions', 'Blockly.Field', 'Blockly.FieldAngle', 'Blockly.FieldCheckbox', 'Blockly.FieldColour', 'Blockly.FieldDropdown', 'Blockly.FieldImage', 'Blockly.FieldLabel', 'Blockly.FieldLabelSerializable', 'Blockly.FieldMultilineInput', 'Blockly.FieldNumber', 'Blockly.FieldTextInput', 'Blockly.FieldVariable', 'Blockly.Flyout', 'Blockly.FlyoutButton', 'Blockly.FlyoutMetricsManager', 'Blockly.Generator', 'Blockly.Gesture', 'Blockly.Grid', 'Blockly.HorizontalFlyout', 'Blockly.Icon', 'Blockly.Input', 'Blockly.InsertionMarkerManager', 'Blockly.Marker', 'Blockly.MarkerManager', 'Blockly.Menu', 'Blockly.MenuItem', 'Blockly.MetricsManager', 'Blockly.Mutator', 'Blockly.Names', 'Blockly.Options', 'Blockly.Procedures', 'Blockly.Procedures', 'Blockly.RenderedConnection', 'Blockly.Scrollbar', 'Blockly.ScrollbarPair', 'Blockly.ShortcutItems', 'Blockly.ShortcutRegistry', 'Blockly.TabNavigateCursor', 'Blockly.Theme', 'Blockly.ThemeManager', 'Blockly.Toolbox', 'Blockly.ToolboxCategory', 'Blockly.ToolboxItem', 'Blockly.ToolboxSeparator', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.Touch', 'Blockly.TouchGesture', 'Blockly.Trashcan', 'Blockly.VariableMap', 'Blockly.VariableModel', 'Blockly.Variables', 'Blockly.Variables', 'Blockly.VariablesDynamic', 'Blockly.VerticalFlyout', 'Blockly.Warning', 'Blockly.WidgetDiv', 'Blockly.Workspace', 'Blockly.WorkspaceAudio', 'Blockly.WorkspaceComment', 'Blockly.WorkspaceCommentSvg', 'Blockly.WorkspaceDragSurfaceSvg', 'Blockly.WorkspaceDragger', 'Blockly.WorkspaceSvg', 'Blockly.Xml', 'Blockly.Xml', 'Blockly.ZoomControls', 'Blockly.blockAnimations', 'Blockly.browserEvents', 'Blockly.bumpObjects', 'Blockly.clipboard', 'Blockly.common', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.dialog', 'Blockly.fieldRegistry', 'Blockly.inject', 'Blockly.inject', 'Blockly.inputTypes', 'Blockly.internalConstants', 'Blockly.registry', 'Blockly.uiPosition', 'Blockly.utils', 'Blockly.utils.Size', 'Blockly.utils.colour', 'Blockly.utils.deprecation', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'}); goog.addDependency('../../core/blockly_options.js', ['Blockly.BlocklyOptions'], [], {'lang': 'es6', 'module': 'goog'}); goog.addDependency('../../core/blocks.js', ['Blockly.Blocks'], [], {'lang': 'es6', 'module': 'goog'}); goog.addDependency('../../core/browser_events.js', ['Blockly.browserEvents'], ['Blockly.Touch', 'Blockly.internalConstants', 'Blockly.utils.global', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'}); @@ -87,7 +87,7 @@ goog.addDependency('../../core/generator.js', ['Blockly.Generator'], ['Blockly.c goog.addDependency('../../core/gesture.js', ['Blockly.Gesture'], ['Blockly.BlockDragger', 'Blockly.BubbleDragger', 'Blockly.Events', 'Blockly.Events.Click', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.Workspace', 'Blockly.WorkspaceDragger', 'Blockly.blockAnimations', 'Blockly.browserEvents', 'Blockly.common', 'Blockly.internalConstants', 'Blockly.registry', 'Blockly.utils.Coordinate'], {'lang': 'es6', 'module': 'goog'}); goog.addDependency('../../core/grid.js', ['Blockly.Grid'], ['Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'}); goog.addDependency('../../core/icon.js', ['Blockly.Icon'], ['Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'}); -goog.addDependency('../../core/inject.js', ['Blockly.inject'], ['Blockly.BlockDragSurfaceSvg', 'Blockly.Css', 'Blockly.DropDownDiv', 'Blockly.Grid', 'Blockly.Msg', 'Blockly.Options', 'Blockly.ScrollbarPair', 'Blockly.ShortcutRegistry', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.WidgetDiv', 'Blockly.Workspace', 'Blockly.WorkspaceDragSurfaceSvg', 'Blockly.WorkspaceSvg', 'Blockly.browserEvents', 'Blockly.bumpObjects', 'Blockly.common', 'Blockly.utils', 'Blockly.utils.Svg', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'}); +goog.addDependency('../../core/inject.js', ['Blockly.inject'], ['Blockly.BlockDragSurfaceSvg', 'Blockly.Css', 'Blockly.DropDownDiv', 'Blockly.Grid', 'Blockly.Msg', 'Blockly.Options', 'Blockly.ScrollbarPair', 'Blockly.ShortcutRegistry', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.WidgetDiv', 'Blockly.Workspace', 'Blockly.WorkspaceDragSurfaceSvg', 'Blockly.WorkspaceSvg', 'Blockly.browserEvents', 'Blockly.bumpObjects', 'Blockly.common', 'Blockly.utils.Svg', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'}); goog.addDependency('../../core/input.js', ['Blockly.Input'], ['Blockly.FieldLabel', 'Blockly.constants', 'Blockly.fieldRegistry', 'Blockly.inputTypes'], {'lang': 'es6', 'module': 'goog'}); goog.addDependency('../../core/input_types.js', ['Blockly.inputTypes'], ['Blockly.connectionTypes'], {'lang': 'es6', 'module': 'goog'}); goog.addDependency('../../core/insertion_marker_manager.js', ['Blockly.InsertionMarkerManager'], ['Blockly.ComponentManager', 'Blockly.Events', 'Blockly.blockAnimations', 'Blockly.common', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.internalConstants'], {'lang': 'es6', 'module': 'goog'});