From 40dedcee29dfbedfad133f18396f4fe72a444e65 Mon Sep 17 00:00:00 2001 From: Beka Westberg Date: Thu, 7 Jul 2022 22:48:51 +0000 Subject: [PATCH] manual fixes to import types --- core/block_svg.ts | 4 ++-- core/events/events_abstract.ts | 2 +- core/events/utils.ts | 2 +- core/flyout_base.ts | 2 +- core/generator.ts | 2 +- core/gesture.ts | 2 +- core/renderers/common/renderer.ts | 2 +- core/renderers/zelos/constants.ts | 2 +- core/renderers/zelos/info.ts | 2 +- core/workspace.ts | 2 +- core/workspace_svg.ts | 8 ++++---- 11 files changed, 15 insertions(+), 15 deletions(-) diff --git a/core/block_svg.ts b/core/block_svg.ts index 97919ca03..3f0b2952f 100644 --- a/core/block_svg.ts +++ b/core/block_svg.ts @@ -25,7 +25,7 @@ import './touch'; import {Block} from './block'; import * as blockAnimations from './block_animations'; import * as browserEvents from './browser_events'; -import type {Comment} from './comment'; +import {Comment} from './comment'; import * as common from './common'; import {config} from './config'; import type {Connection} from './connection'; @@ -60,7 +60,7 @@ import * as dom from './utils/dom'; import {Rect} from './utils/rect'; import {Svg} from './utils/svg'; import * as svgMath from './utils/svg_math'; -import type {Warning} from './warning'; +import {Warning} from './warning'; import {Workspace} from './workspace'; import type {WorkspaceSvg} from './workspace_svg'; diff --git a/core/events/events_abstract.ts b/core/events/events_abstract.ts index 6bc0dffae..eecd1c130 100644 --- a/core/events/events_abstract.ts +++ b/core/events/events_abstract.ts @@ -16,7 +16,7 @@ */ -import type {Workspace} from '../workspace'; +import {Workspace} from '../workspace'; import * as eventUtils from './utils'; diff --git a/core/events/utils.ts b/core/events/utils.ts index 49f3f72c9..47a19d51f 100644 --- a/core/events/utils.ts +++ b/core/events/utils.ts @@ -19,7 +19,7 @@ import type {Block} from '../block'; import * as registry from '../registry'; import * as idGenerator from '../utils/idgenerator'; -import type {Workspace} from '../workspace'; +import {Workspace} from '../workspace'; import type {WorkspaceSvg} from '../workspace_svg'; import type {Abstract} from './events_abstract'; diff --git a/core/flyout_base.ts b/core/flyout_base.ts index 03db1b2ce..e4a08d724 100644 --- a/core/flyout_base.ts +++ b/core/flyout_base.ts @@ -23,7 +23,7 @@ import {DeleteArea} from './delete_area'; import * as BlockCreate from './events/events_block_create'; import * as VarCreate from './events/events_var_create'; import * as eventUtils from './events/utils'; -import type {FlyoutButton} from './flyout_button'; +import {FlyoutButton} from './flyout_button'; import {FlyoutMetricsManager} from './flyout_metrics_manager'; import * as Gesture from './gesture'; import type {IFlyout} from './interfaces/i_flyout'; diff --git a/core/generator.ts b/core/generator.ts index d5fd8281a..4b9f7669c 100644 --- a/core/generator.ts +++ b/core/generator.ts @@ -18,7 +18,7 @@ import type {Block} from './block'; import * as common from './common'; -import type {Names, NameType} from './names'; +import {Names, NameType} from './names'; import * as deprecation from './utils/deprecation'; import type {Workspace} from './workspace'; diff --git a/core/gesture.ts b/core/gesture.ts index 0a6dd3365..89da33f59 100644 --- a/core/gesture.ts +++ b/core/gesture.ts @@ -38,7 +38,7 @@ import * as Tooltip from './tooltip'; import * as Touch from './touch'; import {Coordinate} from './utils/coordinate'; import {Workspace} from './workspace'; -import type {WorkspaceCommentSvg} from './workspace_comment_svg'; +import {WorkspaceCommentSvg} from './workspace_comment_svg'; import {WorkspaceDragger} from './workspace_dragger'; import type {WorkspaceSvg} from './workspace_svg'; diff --git a/core/renderers/common/renderer.ts b/core/renderers/common/renderer.ts index c10369472..50c855ff9 100644 --- a/core/renderers/common/renderer.ts +++ b/core/renderers/common/renderer.ts @@ -27,7 +27,7 @@ import type {WorkspaceSvg} from '../../workspace_svg'; import {ConstantProvider} from './constants'; import * as debug from './debug'; -import type {Debug} from './debugger'; +import {Debug} from './debugger'; import {Drawer} from './drawer'; import type {IPathObject} from './i_path_object'; import {RenderInfo} from './info'; diff --git a/core/renderers/zelos/constants.ts b/core/renderers/zelos/constants.ts index ef8452ffc..172c6a9f5 100644 --- a/core/renderers/zelos/constants.ts +++ b/core/renderers/zelos/constants.ts @@ -23,7 +23,7 @@ import * as utilsColour from '../../utils/colour'; import * as dom from '../../utils/dom'; import {Svg} from '../../utils/svg'; import * as svgPaths from '../../utils/svg_paths'; -import type {ConstantProvider as BaseConstantProvider, Shape} from '../common/constants'; +import {ConstantProvider as BaseConstantProvider, Shape} from '../common/constants'; /** An object containing sizing and path information about inside corners. */ diff --git a/core/renderers/zelos/info.ts b/core/renderers/zelos/info.ts index 8ae962af2..eaddbb99e 100644 --- a/core/renderers/zelos/info.ts +++ b/core/renderers/zelos/info.ts @@ -21,7 +21,7 @@ import {FieldLabel} from '../../field_label'; import {FieldTextInput} from '../../field_textinput'; import {Align, Input} from '../../input'; import {inputTypes} from '../../input_types'; -import type {RenderInfo as BaseRenderInfo} from '../common/info'; +import {RenderInfo as BaseRenderInfo} from '../common/info'; import type {Measurable} from '../measurables/base'; import {Field} from '../measurables/field'; import {InRowSpacer} from '../measurables/in_row_spacer'; diff --git a/core/workspace.ts b/core/workspace.ts index 573bb7d37..bfead607c 100644 --- a/core/workspace.ts +++ b/core/workspace.ts @@ -17,7 +17,7 @@ // Unused import preserved for side-effects. Remove if unneeded. import './connection_checker'; -import type {Block} from './block'; +import {Block} from './block'; import type {BlocklyOptions} from './blockly_options'; import type {ConnectionDB} from './connection_db'; import type {Abstract} from './events/events_abstract'; diff --git a/core/workspace_svg.ts b/core/workspace_svg.ts index d1f3d270e..ed9b97eef 100644 --- a/core/workspace_svg.ts +++ b/core/workspace_svg.ts @@ -40,7 +40,7 @@ import './metrics_manager'; // Unused import preserved for side-effects. Remove if unneeded. import './msg'; -import type {Block} from './block'; +import {Block} from './block'; import type {BlockDragSurfaceSvg} from './block_drag_surface'; import {BlockSvg} from './block_svg'; import type {BlocklyOptions} from './blockly_options'; @@ -78,7 +78,7 @@ import {Classic} from './theme/classic'; import {ThemeManager} from './theme_manager'; import * as Tooltip from './tooltip'; import {TouchGesture} from './touch_gesture'; -import type {Trashcan} from './trashcan'; +import {Trashcan} from './trashcan'; import * as utils from './utils'; import * as arrayUtils from './utils/array'; import {Coordinate} from './utils/coordinate'; @@ -96,8 +96,8 @@ import * as VariablesDynamic from './variables_dynamic'; import * as WidgetDiv from './widgetdiv'; import {Workspace} from './workspace'; import {WorkspaceAudio} from './workspace_audio'; -import type {WorkspaceComment} from './workspace_comment'; -import type {WorkspaceCommentSvg} from './workspace_comment_svg'; +import {WorkspaceComment} from './workspace_comment'; +import {WorkspaceCommentSvg} from './workspace_comment_svg'; import type {WorkspaceDragSurfaceSvg} from './workspace_drag_surface_svg'; import * as Xml from './xml'; import {ZoomControls} from './zoom_controls';