From 4fcb45ca5ccdbbcf0d0d20f452c08b7d9572a8ff Mon Sep 17 00:00:00 2001 From: Beka Westberg Date: Tue, 28 Jun 2022 21:18:02 +0000 Subject: [PATCH] fix: temporarily get the project to build --- core/blockly.ts | 11 --- scripts/gulpfiles/chunks.json | 139 +++++++++++++--------------------- tsconfig.json | 2 +- 3 files changed, 55 insertions(+), 97 deletions(-) diff --git a/core/blockly.ts b/core/blockly.ts index 24a87e9f9..9a01e7d27 100644 --- a/core/blockly.ts +++ b/core/blockly.ts @@ -179,17 +179,6 @@ import * as Xml from './xml.js'; import {ZoomControls} from './zoom_controls.js'; -/** - * 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 - */ -export const VERSION = 'uncompiled'; /* * Top-level functions and properties on the Blockly namespace. diff --git a/scripts/gulpfiles/chunks.json b/scripts/gulpfiles/chunks.json index 1461e2ad4..b09d0c3f8 100644 --- a/scripts/gulpfiles/chunks.json +++ b/scripts/gulpfiles/chunks.json @@ -1,6 +1,6 @@ { "chunk": [ - "blockly:259", + "blockly:228", "blocks:10:blockly", "all:11:blockly", "all1:11:blockly", @@ -9,56 +9,13 @@ "all4:11:blockly" ], "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,40 +45,42 @@ "./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.js", @@ -139,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", @@ -177,29 +133,33 @@ "./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", "./build/src/core/events/events_block_drag.js", "./build/src/core/block_dragger.js", "./build/src/core/gesture.js", - "./build/src/core/utils/keycodes.js", "./build/src/core/shortcut_registry.js", "./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/closure/goog/base_minimal.js", "./build/src/core/blockly.js", "./blocks/variables_dynamic.js", diff --git a/tsconfig.json b/tsconfig.json index 9b2f92082..9a7371b66 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -4,7 +4,7 @@ "closure/**/*", // Just for ouptut directory structure. ], "exclude": [ - "core/blockly.ts" + "core/blockly.js" ], "compilerOptions": { // Tells TypeScript to read JS files, as