From 5515afc708ad4306ed8e4f14444c7b1bf5478d7e Mon Sep 17 00:00:00 2001 From: alschmiedt Date: Thu, 2 Dec 2021 10:21:58 -0800 Subject: [PATCH] chore: Remove declareLegacyNamespace from serialization folder (#5757) --- core/blockly.js | 16 ++++++++++++++++ core/interfaces/i_serializer.js | 1 - core/serialization/blocks.js | 1 - core/serialization/exceptions.js | 2 +- core/serialization/priorities.js | 1 - core/serialization/registry.js | 2 -- core/serialization/variables.js | 1 - core/serialization/workspaces.js | 1 - scripts/gulpfiles/chunks.json | 8 ++++---- tests/deps.js | 2 +- 10 files changed, 22 insertions(+), 13 deletions(-) diff --git a/core/blockly.js b/core/blockly.js index e59dd9254..811279c57 100644 --- a/core/blockly.js +++ b/core/blockly.js @@ -45,6 +45,12 @@ 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'); @@ -118,6 +124,7 @@ 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'); @@ -708,6 +715,15 @@ 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; diff --git a/core/interfaces/i_serializer.js b/core/interfaces/i_serializer.js index ca85842f4..eac298b3e 100644 --- a/core/interfaces/i_serializer.js +++ b/core/interfaces/i_serializer.js @@ -17,7 +17,6 @@ * @namespace Blockly.serialization.ISerializer */ goog.module('Blockly.serialization.ISerializer'); -goog.module.declareLegacyNamespace(); // eslint-disable-next-line no-unused-vars const {Workspace} = goog.requireType('Blockly.Workspace'); diff --git a/core/serialization/blocks.js b/core/serialization/blocks.js index 279a0b402..150ea865f 100644 --- a/core/serialization/blocks.js +++ b/core/serialization/blocks.js @@ -15,7 +15,6 @@ * @namespace Blockly.serialization.blocks */ goog.module('Blockly.serialization.blocks'); -goog.module.declareLegacyNamespace(); const Xml = goog.require('Blockly.Xml'); const eventUtils = goog.require('Blockly.Events.utils'); diff --git a/core/serialization/exceptions.js b/core/serialization/exceptions.js index bd1792665..d626c28a1 100644 --- a/core/serialization/exceptions.js +++ b/core/serialization/exceptions.js @@ -15,13 +15,13 @@ * @namespace Blockly.serialization.exceptions */ goog.module('Blockly.serialization.exceptions'); -goog.module.declareLegacyNamespace(); /* eslint-disable-next-line no-unused-vars */ const {Block} = goog.requireType('Blockly.Block'); // eslint-disable-next-line no-unused-vars const {State} = goog.requireType('Blockly.serialization.blocks'); + /** * @alias Blockly.serialization.exceptions.DeserializationError */ diff --git a/core/serialization/priorities.js b/core/serialization/priorities.js index 914c66402..ad395fc0a 100644 --- a/core/serialization/priorities.js +++ b/core/serialization/priorities.js @@ -19,7 +19,6 @@ * @namespace Blockly.serialization.priorities */ goog.module('Blockly.serialization.priorities'); -goog.module.declareLegacyNamespace(); /** diff --git a/core/serialization/registry.js b/core/serialization/registry.js index 4d51494ac..1b3671113 100644 --- a/core/serialization/registry.js +++ b/core/serialization/registry.js @@ -16,8 +16,6 @@ * @namespace Blockly.serialization.registry */ goog.module('Blockly.serialization.registry'); -goog.module.declareLegacyNamespace(); - const registry = goog.require('Blockly.registry'); // eslint-disable-next-line no-unused-vars diff --git a/core/serialization/variables.js b/core/serialization/variables.js index 04e0d567e..49613a0e5 100644 --- a/core/serialization/variables.js +++ b/core/serialization/variables.js @@ -16,7 +16,6 @@ * @namespace Blockly.serialization.variables */ goog.module('Blockly.serialization.variables'); -goog.module.declareLegacyNamespace(); const priorities = goog.require('Blockly.serialization.priorities'); const serializationRegistry = goog.require('Blockly.serialization.registry'); diff --git a/core/serialization/workspaces.js b/core/serialization/workspaces.js index 0719fe85e..d3e1c08d9 100644 --- a/core/serialization/workspaces.js +++ b/core/serialization/workspaces.js @@ -16,7 +16,6 @@ * @namespace Blockly.serialization.workspaces */ goog.module('Blockly.serialization.workspaces'); -goog.module.declareLegacyNamespace(); const dom = goog.require('Blockly.utils.dom'); const eventUtils = goog.require('Blockly.Events.utils'); diff --git a/scripts/gulpfiles/chunks.json b/scripts/gulpfiles/chunks.json index 8b8112033..776a80852 100644 --- a/scripts/gulpfiles/chunks.json +++ b/scripts/gulpfiles/chunks.json @@ -9,8 +9,6 @@ "all5:11:requires" ], "js": [ - "./core/serialization/workspaces.js", - "./core/serialization/variables.js", "./core/contextmenu_items.js", "./core/shortcut_items.js", "./core/theme/zelos.js", @@ -30,13 +28,14 @@ "./core/renderers/minimalist/info.js", "./core/renderers/minimalist/drawer.js", "./core/renderers/minimalist/minimalist.js", + "./core/serialization/variables.js", + "./core/serialization/workspaces.js", "./core/renderers/thrasos/renderer.js", "./core/renderers/thrasos/info.js", "./core/renderers/thrasos/thrasos.js", "./core/renderers/zelos/measurables/bottom_row.js", "./core/renderers/zelos/constants.js", "./core/renderers/zelos/path_object.js", - "./core/field_image.js", "./core/renderers/zelos/marker_svg.js", "./core/renderers/zelos/renderer.js", "./core/renderers/zelos/measurables/row_elements.js", @@ -49,7 +48,6 @@ "./core/field_angle.js", "./core/field_colour.js", "./core/field_label_serializable.js", - "./core/field_multilineinput.js", "./core/flyout_metrics_manager.js", "./core/flyout_base.js", "./core/generator.js", @@ -61,9 +59,11 @@ "./core/blockly.js", "./core/field_variable.js", "./core/field_number.js", + "./core/field_multilineinput.js", "./core/field_dropdown.js", "./core/field_checkbox.js", "./core/field_textinput.js", + "./core/field_image.js", "./core/events/workspace_events.js", "./core/events/events_toolbox_item_select.js", "./core/events/events_ui.js", diff --git a/tests/deps.js b/tests/deps.js index 914827eef..d2a0763c4 100644 --- a/tests/deps.js +++ b/tests/deps.js @@ -13,7 +13,7 @@ goog.addDependency('../../core/block_animations.js', ['Blockly.blockAnimations'] goog.addDependency('../../core/block_drag_surface.js', ['Blockly.BlockDragSurfaceSvg'], ['Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.svgMath'], {'lang': 'es6', 'module': 'goog'}); goog.addDependency('../../core/block_dragger.js', ['Blockly.BlockDragger'], ['Blockly.Events.BlockDrag', 'Blockly.Events.BlockMove', 'Blockly.Events.utils', 'Blockly.IBlockDragger', '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.ConnectionType', 'Blockly.ContextMenu', 'Blockly.ContextMenuRegistry', 'Blockly.Events.BlockMove', 'Blockly.Events.Selected', 'Blockly.Events.utils', 'Blockly.FieldLabel', 'Blockly.IASTNodeLocationSvg', 'Blockly.IBoundedElement', 'Blockly.ICopyable', 'Blockly.IDraggable', 'Blockly.MarkerManager', 'Blockly.Msg', 'Blockly.RenderedConnection', 'Blockly.TabNavigateCursor', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.blockAnimations', 'Blockly.browserEvents', 'Blockly.common', 'Blockly.constants', 'Blockly.internalConstants', 'Blockly.serialization.blocks', 'Blockly.utils.Coordinate', 'Blockly.utils.Rect', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.svgMath', '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.BlocklyOptions', 'Blockly.Bubble', 'Blockly.BubbleDragger', 'Blockly.CollapsibleToolboxCategory', 'Blockly.Comment', 'Blockly.ComponentManager', 'Blockly.Connection', 'Blockly.ConnectionChecker', 'Blockly.ConnectionDB', 'Blockly.ConnectionType', 'Blockly.ContextMenu', 'Blockly.ContextMenuItems', 'Blockly.ContextMenuRegistry', 'Blockly.Css', 'Blockly.Cursor', 'Blockly.DeleteArea', 'Blockly.DragTarget', 'Blockly.DropDownDiv', 'Blockly.Events', '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.IASTNodeLocation', 'Blockly.IASTNodeLocationSvg', 'Blockly.IASTNodeLocationWithBlock', 'Blockly.IAutoHideable', 'Blockly.IBlockDragger', 'Blockly.IBoundedElement', 'Blockly.IBubble', 'Blockly.ICollapsibleToolboxItem', 'Blockly.IComponent', 'Blockly.IConnectionChecker', 'Blockly.IContextMenu', 'Blockly.ICopyable', 'Blockly.IDeletable', 'Blockly.IDeleteArea', 'Blockly.IDragTarget', 'Blockly.IDraggable', 'Blockly.IFlyout', 'Blockly.IKeyboardAccessible', 'Blockly.IMetricsManager', 'Blockly.IMovable', 'Blockly.IPositionable', 'Blockly.IRegistrable', 'Blockly.IRegistrableField', 'Blockly.ISelectable', 'Blockly.ISelectableToolboxItem', 'Blockly.IStyleable', 'Blockly.IToolbox', 'Blockly.IToolboxItem', 'Blockly.Icon', 'Blockly.Input', 'Blockly.InsertionMarkerManager', 'Blockly.Marker', 'Blockly.MarkerManager', 'Blockly.Menu', 'Blockly.MenuItem', 'Blockly.MetricsManager', 'Blockly.Msg', 'Blockly.Mutator', 'Blockly.Names', 'Blockly.Options', 'Blockly.Procedures', 'Blockly.RenderedConnection', 'Blockly.Scrollbar', 'Blockly.ScrollbarPair', 'Blockly.ShortcutItems', 'Blockly.ShortcutRegistry', 'Blockly.TabNavigateCursor', 'Blockly.Theme', 'Blockly.ThemeManager', 'Blockly.Themes', 'Blockly.Toolbox', 'Blockly.ToolboxCategory', 'Blockly.ToolboxItem', 'Blockly.ToolboxSeparator', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.TouchGesture', 'Blockly.Trashcan', 'Blockly.VariableMap', 'Blockly.VariableModel', '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.ZoomControls', 'Blockly.blockAnimations', 'Blockly.blockRendering', 'Blockly.blocks', 'Blockly.browserEvents', 'Blockly.bumpObjects', 'Blockly.clipboard', 'Blockly.common', 'Blockly.constants', 'Blockly.dialog', 'Blockly.fieldRegistry', 'Blockly.geras', 'Blockly.inject', 'Blockly.inputTypes', 'Blockly.internalConstants', 'Blockly.minimalist', 'Blockly.registry', 'Blockly.thrasos', 'Blockly.uiPosition', 'Blockly.utils', 'Blockly.utils.colour', 'Blockly.utils.deprecation', 'Blockly.utils.global', 'Blockly.utils.svgMath', 'Blockly.utils.toolbox', 'Blockly.zelos'], {'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.Bubble', 'Blockly.BubbleDragger', 'Blockly.CollapsibleToolboxCategory', 'Blockly.Comment', 'Blockly.ComponentManager', 'Blockly.Connection', 'Blockly.ConnectionChecker', 'Blockly.ConnectionDB', 'Blockly.ConnectionType', 'Blockly.ContextMenu', 'Blockly.ContextMenuItems', 'Blockly.ContextMenuRegistry', 'Blockly.Css', 'Blockly.Cursor', 'Blockly.DeleteArea', 'Blockly.DragTarget', 'Blockly.DropDownDiv', 'Blockly.Events', '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.IASTNodeLocation', 'Blockly.IASTNodeLocationSvg', 'Blockly.IASTNodeLocationWithBlock', 'Blockly.IAutoHideable', 'Blockly.IBlockDragger', 'Blockly.IBoundedElement', 'Blockly.IBubble', 'Blockly.ICollapsibleToolboxItem', 'Blockly.IComponent', 'Blockly.IConnectionChecker', 'Blockly.IContextMenu', 'Blockly.ICopyable', 'Blockly.IDeletable', 'Blockly.IDeleteArea', 'Blockly.IDragTarget', 'Blockly.IDraggable', 'Blockly.IFlyout', 'Blockly.IKeyboardAccessible', 'Blockly.IMetricsManager', 'Blockly.IMovable', 'Blockly.IPositionable', 'Blockly.IRegistrable', 'Blockly.IRegistrableField', 'Blockly.ISelectable', 'Blockly.ISelectableToolboxItem', 'Blockly.IStyleable', 'Blockly.IToolbox', 'Blockly.IToolboxItem', 'Blockly.Icon', 'Blockly.Input', 'Blockly.InsertionMarkerManager', 'Blockly.Marker', 'Blockly.MarkerManager', 'Blockly.Menu', 'Blockly.MenuItem', 'Blockly.MetricsManager', 'Blockly.Msg', 'Blockly.Mutator', 'Blockly.Names', 'Blockly.Options', 'Blockly.Procedures', 'Blockly.RenderedConnection', 'Blockly.Scrollbar', 'Blockly.ScrollbarPair', 'Blockly.ShortcutItems', 'Blockly.ShortcutRegistry', 'Blockly.TabNavigateCursor', 'Blockly.Theme', 'Blockly.ThemeManager', 'Blockly.Themes', 'Blockly.Toolbox', 'Blockly.ToolboxCategory', 'Blockly.ToolboxItem', 'Blockly.ToolboxSeparator', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.TouchGesture', 'Blockly.Trashcan', 'Blockly.VariableMap', 'Blockly.VariableModel', '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.ZoomControls', 'Blockly.blockAnimations', 'Blockly.blockRendering', 'Blockly.blocks', 'Blockly.browserEvents', 'Blockly.bumpObjects', 'Blockly.clipboard', 'Blockly.common', 'Blockly.constants', 'Blockly.dialog', 'Blockly.fieldRegistry', 'Blockly.geras', 'Blockly.inject', 'Blockly.inputTypes', 'Blockly.internalConstants', 'Blockly.minimalist', 'Blockly.registry', 'Blockly.serialization.ISerializer', 'Blockly.serialization.blocks', 'Blockly.serialization.exceptions', 'Blockly.serialization.priorities', 'Blockly.serialization.registry', 'Blockly.serialization.variables', 'Blockly.serialization.workspaces', 'Blockly.thrasos', 'Blockly.uiPosition', 'Blockly.utils', 'Blockly.utils.colour', 'Blockly.utils.deprecation', 'Blockly.utils.global', 'Blockly.utils.svgMath', 'Blockly.utils.toolbox', 'Blockly.zelos'], {'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'});