From c370ca56d3ec6968ab1d87eaaea9ba27c89f88cd Mon Sep 17 00:00:00 2001
From: Beka Westberg <bwestberg@google.com>
Date: Fri, 8 Jul 2022 22:44:18 +0000
Subject: [PATCH] fixup cherry-pick

---
 core/events/utils.ts | 17 +++--------------
 1 file changed, 3 insertions(+), 14 deletions(-)

diff --git a/core/events/utils.ts b/core/events/utils.ts
index 93cc3592d..727f30c43 100644
--- a/core/events/utils.ts
+++ b/core/events/utils.ts
@@ -15,18 +15,10 @@
  * @namespace Blockly.Events.utils
  */
 
-/* eslint-disable-next-line no-unused-vars */
-import {Block} from '../block.js';
-import * as registry from '../registry.js';
-import * as idGenerator from '../utils/idgenerator.js';
-/* eslint-disable-next-line no-unused-vars */
-import type {Workspace} from '../workspace.js';
-/* eslint-disable-next-line no-unused-vars */
-import {WorkspaceSvg} from '../workspace_svg.js';
-
 import type {Block} from '../block';
 import * as registry from '../registry';
 import * as idGenerator from '../utils/idgenerator';
+import type {Workspace} from '../workspace';
 import type {WorkspaceSvg} from '../workspace_svg';
 
 import type {Abstract} from './events_abstract';
@@ -37,11 +29,8 @@ import type {CommentCreate} from './events_comment_create';
 import type {CommentMove} from './events_comment_move';
 import type {ViewportChange} from './events_viewport';
 
-/** @internal */
-export const {Workspace} = await import('../workspace');
 
-
-import {getWorkspaceById} from '../common.js';
+import {getWorkspaceById} from '../common';
 
 
 /** Group ID for new events.  Grouped events are indivisible. */
@@ -453,7 +442,7 @@ export function getDescendantIds(block: Block): string[] {
  * @alias Blockly.Events.utils.fromJson
  */
 export function fromJson(
-  json: AnyDuringMigration, workspace: InstanceType<typeof Workspace>): Abstract {
+  json: AnyDuringMigration, workspace: Workspace): Abstract {
   const eventClass = get(json['type']);
   if (!eventClass) {
     throw Error('Unknown event type.');