refactor: Migrate to named exports (google#5623)

* refactor: Migrate to named exports * fix: Sort requires * fix: Remove duplicate deps
mark-friedman · Oct 20, 2021 · 3851b14 · 3851b14
1 parent abe1ffe
commit 3851b14
Show file tree

Hide file tree

Showing 235 changed files with 1,577 additions and 1,586 deletions.
diff --git a/core/block.js b/core/block.js
@@ -17,37 +17,37 @@ goog.module('Blockly.Block');
 
 /* eslint-disable-next-line no-unused-vars */
 const Abstract = goog.requireType('Blockly.Events.Abstract');
-/* eslint-disable-next-line no-unused-vars */
-const Comment = goog.requireType('Blockly.Comment');
-const Connection = goog.require('Blockly.Connection');
-const Coordinate = goog.require('Blockly.utils.Coordinate');
 const Extensions = goog.require('Blockly.Extensions');
-/* eslint-disable-next-line no-unused-vars */
-const Field = goog.requireType('Blockly.Field');
-/* eslint-disable-next-line no-unused-vars */
-const IASTNodeLocation = goog.require('Blockly.IASTNodeLocation');
-/* eslint-disable-next-line no-unused-vars */
-const IDeletable = goog.require('Blockly.IDeletable');
-const Input = goog.require('Blockly.Input');
-/* eslint-disable-next-line no-unused-vars */
-const Mutator = goog.requireType('Blockly.Mutator');
-const Size = goog.require('Blockly.utils.Size');
 const Tooltip = goog.require('Blockly.Tooltip');
-/* eslint-disable-next-line no-unused-vars */
-const VariableModel = goog.requireType('Blockly.VariableModel');
-/* eslint-disable-next-line no-unused-vars */
-const Workspace = goog.requireType('Blockly.Workspace');
 const common = goog.require('Blockly.common');
 const constants = goog.require('Blockly.constants');
 const eventUtils = goog.require('Blockly.Events.utils');
 const fieldRegistry = goog.require('Blockly.fieldRegistry');
 const idGenerator = goog.require('Blockly.utils.idGenerator');
-const inputTypes = goog.require('Blockly.inputTypes');
 const object = goog.require('Blockly.utils.object');
 const utils = goog.require('Blockly.utils');
 const {ASTNode} = goog.require('Blockly.ASTNode');
 const {Blocks} = goog.require('Blockly.blocks');
+/* eslint-disable-next-line no-unused-vars */
+const {Comment} = goog.requireType('Blockly.Comment');
 const {ConnectionType} = goog.require('Blockly.ConnectionType');
+const {Connection} = goog.require('Blockly.Connection');
+const {Coordinate} = goog.require('Blockly.utils.Coordinate');
+/* eslint-disable-next-line no-unused-vars */
+const {Field} = goog.requireType('Blockly.Field');
+/* eslint-disable-next-line no-unused-vars */
+const {IASTNodeLocation} = goog.require('Blockly.IASTNodeLocation');
+/* eslint-disable-next-line no-unused-vars */
+const {IDeletable} = goog.require('Blockly.IDeletable');
+const {Input} = goog.require('Blockly.Input');
+/* eslint-disable-next-line no-unused-vars */
+const {Mutator} = goog.requireType('Blockly.Mutator');
+const {Size} = goog.require('Blockly.utils.Size');
+/* eslint-disable-next-line no-unused-vars */
+const {VariableModel} = goog.requireType('Blockly.VariableModel');
+/* eslint-disable-next-line no-unused-vars */
+const {Workspace} = goog.requireType('Blockly.Workspace');
+const {inputTypes} = goog.require('Blockly.inputTypes');
 /** @suppress {extraRequire} */
 goog.require('Blockly.Events.BlockChange');
 /** @suppress {extraRequire} */
@@ -73,7 +73,7 @@ goog.require('Blockly.Events.BlockMove');
  * @alias Blockly.Block
  */
 const Block = function(workspace, prototypeName, opt_id) {
- const Generator = goog.module.get('Blockly.Generator');
+ const {Generator} = goog.module.get('Blockly.Generator');
  if (Generator && typeof Generator.prototype[prototypeName] !== 'undefined') {
  // Occluding Generator class members is not allowed.
  throw Error(

diff --git a/core/block_animations.js b/core/block_animations.js
@@ -15,10 +15,10 @@
  */
 goog.module('Blockly.blockAnimations');
 
-const Svg = goog.require('Blockly.utils.Svg');
 const dom = goog.require('Blockly.utils.dom');
 /* eslint-disable-next-line no-unused-vars */
 const {BlockSvg} = goog.requireType('Blockly.BlockSvg');
+const {Svg} = goog.require('Blockly.utils.Svg');
 
 
 /**

diff --git a/core/block_drag_surface.js b/core/block_drag_surface.js
@@ -26,10 +26,10 @@
  */
 goog.module('Blockly.BlockDragSurfaceSvg');
 
-const Coordinate = goog.require('Blockly.utils.Coordinate');
-const Svg = goog.require('Blockly.utils.Svg');
 const dom = goog.require('Blockly.utils.dom');
 const utils = goog.require('Blockly.utils');
+const {Coordinate} = goog.require('Blockly.utils.Coordinate');
+const {Svg} = goog.require('Blockly.utils.Svg');
 
 
 /**

diff --git a/core/block_dragger.js b/core/block_dragger.js
@@ -15,14 +15,6 @@
  */
 goog.module('Blockly.BlockDragger');
 
-const Coordinate = goog.require('Blockly.utils.Coordinate');
-/* eslint-disable-next-line no-unused-vars */
-const IBlockDragger = goog.require('Blockly.IBlockDragger');
-/* eslint-disable-next-line no-unused-vars */
-const IDragTarget = goog.requireType('Blockly.IDragTarget');
-const InsertionMarkerManager = goog.require('Blockly.InsertionMarkerManager');
-/* eslint-disable-next-line no-unused-vars */
-const WorkspaceSvg = goog.requireType('Blockly.WorkspaceSvg');
 const blockAnimation = goog.require('Blockly.blockAnimations');
 const bumpObjects = goog.require('Blockly.bumpObjects');
 const common = goog.require('Blockly.common');
@@ -31,6 +23,14 @@ const eventUtils = goog.require('Blockly.Events.utils');
 const registry = goog.require('Blockly.registry');
 /* eslint-disable-next-line no-unused-vars */
 const {BlockSvg} = goog.requireType('Blockly.BlockSvg');
+const {Coordinate} = goog.require('Blockly.utils.Coordinate');
+/* eslint-disable-next-line no-unused-vars */
+const {IBlockDragger} = goog.require('Blockly.IBlockDragger');
+/* eslint-disable-next-line no-unused-vars */
+const {IDragTarget} = goog.requireType('Blockly.IDragTarget');
+const {InsertionMarkerManager} = goog.require('Blockly.InsertionMarkerManager');
+/* eslint-disable-next-line no-unused-vars */
+const {WorkspaceSvg} = goog.requireType('Blockly.WorkspaceSvg');
 /** @suppress {extraRequire} */
 goog.require('Blockly.Events.BlockDrag');
 /** @suppress {extraRequire} */

diff --git a/core/block_svg.js b/core/block_svg.js
@@ -15,46 +15,9 @@
  */
 goog.module('Blockly.BlockSvg');
 
-/* eslint-disable-next-line no-unused-vars */
-const BlockRenderingDebug = goog.requireType('Blockly.blockRendering.Debug');
-/* eslint-disable-next-line no-unused-vars */
-const Comment = goog.requireType('Blockly.Comment');
-/* eslint-disable-next-line no-unused-vars */
-const Connection = goog.requireType('Blockly.Connection');
 const ContextMenu = goog.require('Blockly.ContextMenu');
-const ContextMenuRegistry = goog.require('Blockly.ContextMenuRegistry');
-const Coordinate = goog.require('Blockly.utils.Coordinate');
-/* eslint-disable-next-line no-unused-vars */
-const Field = goog.requireType('Blockly.Field');
-const FieldLabel = goog.require('Blockly.FieldLabel');
-/* eslint-disable-next-line no-unused-vars */
-const IASTNodeLocationSvg = goog.require('Blockly.IASTNodeLocationSvg');
-/* eslint-disable-next-line no-unused-vars */
-const IBoundedElement = goog.require('Blockly.IBoundedElement');
-/* eslint-disable-next-line no-unused-vars */
-const ICopyable = goog.require('Blockly.ICopyable');
-/* eslint-disable-next-line no-unused-vars */
-const IDraggable = goog.require('Blockly.IDraggable');
-/* eslint-disable-next-line no-unused-vars */
-const IPathObject = goog.requireType('Blockly.blockRendering.IPathObject');
-/* eslint-disable-next-line no-unused-vars */
-const Icon = goog.requireType('Blockly.Icon');
-/* eslint-disable-next-line no-unused-vars */
-const Input = goog.requireType('Blockly.Input');
-const MarkerManager = goog.require('Blockly.MarkerManager');
 const Msg = goog.require('Blockly.Msg');
-/* eslint-disable-next-line no-unused-vars */
-const Mutator = goog.requireType('Blockly.Mutator');
-const Rect = goog.require('Blockly.utils.Rect');
-const RenderedConnection = goog.require('Blockly.RenderedConnection');
-const Svg = goog.require('Blockly.utils.Svg');
-/* eslint-disable-next-line no-unused-vars */
-const Theme = goog.requireType('Blockly.Theme');
 const Tooltip = goog.require('Blockly.Tooltip');
-/* eslint-disable-next-line no-unused-vars */
-const Warning = goog.requireType('Blockly.Warning');
-/* eslint-disable-next-line no-unused-vars */
-const WorkspaceSvg = goog.requireType('Blockly.WorkspaceSvg');
 const blockAnimations = goog.require('Blockly.blockAnimations');
 const blocks = goog.require('Blockly.serialization.blocks');
 const browserEvents = goog.require('Blockly.browserEvents');
@@ -68,8 +31,45 @@ const userAgent = goog.require('Blockly.utils.userAgent');
 const utils = goog.require('Blockly.utils');
 const {ASTNode} = goog.require('Blockly.ASTNode');
 const {Block} = goog.require('Blockly.Block');
+/* eslint-disable-next-line no-unused-vars */
+const {Comment} = goog.requireType('Blockly.Comment');
 const {ConnectionType} = goog.require('Blockly.ConnectionType');
+/* eslint-disable-next-line no-unused-vars */
+const {Connection} = goog.requireType('Blockly.Connection');
+const {ContextMenuRegistry} = goog.require('Blockly.ContextMenuRegistry');
+const {Coordinate} = goog.require('Blockly.utils.Coordinate');
+/* eslint-disable-next-line no-unused-vars */
+const {Debug: BlockRenderingDebug} = goog.requireType('Blockly.blockRendering.Debug');
+const {FieldLabel} = goog.require('Blockly.FieldLabel');
+/* eslint-disable-next-line no-unused-vars */
+const {Field} = goog.requireType('Blockly.Field');
+/* eslint-disable-next-line no-unused-vars */
+const {IASTNodeLocationSvg} = goog.require('Blockly.IASTNodeLocationSvg');
+/* eslint-disable-next-line no-unused-vars */
+const {IBoundedElement} = goog.require('Blockly.IBoundedElement');
+/* eslint-disable-next-line no-unused-vars */
+const {ICopyable} = goog.require('Blockly.ICopyable');
+/* eslint-disable-next-line no-unused-vars */
+const {IDraggable} = goog.require('Blockly.IDraggable');
+/* eslint-disable-next-line no-unused-vars */
+const {IPathObject} = goog.requireType('Blockly.blockRendering.IPathObject');
+/* eslint-disable-next-line no-unused-vars */
+const {Icon} = goog.requireType('Blockly.Icon');
+/* eslint-disable-next-line no-unused-vars */
+const {Input} = goog.requireType('Blockly.Input');
+const {MarkerManager} = goog.require('Blockly.MarkerManager');
+/* eslint-disable-next-line no-unused-vars */
+const {Mutator} = goog.requireType('Blockly.Mutator');
+const {Rect} = goog.require('Blockly.utils.Rect');
+const {RenderedConnection} = goog.require('Blockly.RenderedConnection');
+const {Svg} = goog.require('Blockly.utils.Svg');
 const {TabNavigateCursor} = goog.require('Blockly.TabNavigateCursor');
+/* eslint-disable-next-line no-unused-vars */
+const {Theme} = goog.requireType('Blockly.Theme');
+/* eslint-disable-next-line no-unused-vars */
+const {Warning} = goog.requireType('Blockly.Warning');
+/* eslint-disable-next-line no-unused-vars */
+const {WorkspaceSvg} = goog.requireType('Blockly.WorkspaceSvg');
 /** @suppress {extraRequire} */
 goog.require('Blockly.Events.BlockMove');
 /** @suppress {extraRequire} */
@@ -1028,7 +1028,7 @@ BlockSvg.prototype.getCommentIcon = function() {
  * @param {?string} text The text, or null to delete.
  */
 BlockSvg.prototype.setCommentText = function(text) {
- const Comment = goog.module.get('Blockly.Comment');
+ const {Comment} = goog.module.get('Blockly.Comment');
  if (!Comment) {
  throw Error('Missing require for Blockly.Comment');
  }
@@ -1066,7 +1066,7 @@ BlockSvg.prototype.setCommentText = function(text) {
  * maintain multiple warnings.
  */
 BlockSvg.prototype.setWarningText = function(text, opt_id) {
- const Warning = goog.module.get('Blockly.Warning');
+ const {Warning} = goog.module.get('Blockly.Warning');
  if (!Warning) {
  throw Error('Missing require for Blockly.Warning');
  }