chore: Remove declareLegacyNamespace() from toolbox/ files

google · Sep 23, 2021 · 8bd2e8c · 8bd2e8c
1 parent fd917f4
commit 8bd2e8c
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 7 deletions.
diff --git a/core/blockly.js b/core/blockly.js
@@ -18,6 +18,11 @@ goog.module('Blockly');
 goog.module.declareLegacyNamespace();
 
 const Blocks = goog.require('Blockly.Blocks');
+const CollapsibleToolboxCategory = goog.require('Blockly.CollapsibleToolboxCategory');
+const Toolbox = goog.require('Blockly.Toolbox');
+const ToolboxCategory = goog.require('Blockly.ToolboxCategory');
+const ToolboxItem = goog.require('Blockly.ToolboxItem');
+const ToolboxSeparator = goog.require('Blockly.ToolboxSeparator');
 /* eslint-disable-next-line no-unused-vars */
 const ICopyable = goog.requireType('Blockly.ICopyable');
 const Marker = goog.require('Blockly.Marker');
@@ -425,6 +430,11 @@ exports.Block = Block;
 exports.BlockDragger = BlockDragger;
 exports.BlockDragSurfaceSvg = BlockDragSurfaceSvg;
 exports.BlockSvg = BlockSvg;
+exports.CollapsibleToolboxCategory = CollapsibleToolboxCategory;
 exports.Cursor = Cursor;
 exports.Marker = Marker;
 exports.TabNavigateCursor = TabNavigateCursor;
+exports.Toolbox = Toolbox;
+exports.ToolboxCategory = ToolboxCategory;
+exports.ToolboxItem = ToolboxItem;
+exports.ToolboxSeparator = ToolboxSeparator;
diff --git a/core/toolbox/category.js b/core/toolbox/category.js
@@ -11,7 +11,6 @@
 'use strict';
 
 goog.module('Blockly.ToolboxCategory');
-goog.module.declareLegacyNamespace();
 
 const Css = goog.require('Blockly.Css');
 /* eslint-disable-next-line no-unused-vars */

diff --git a/core/toolbox/collapsible_category.js b/core/toolbox/collapsible_category.js
@@ -11,7 +11,6 @@
 'use strict';
 
 goog.module('Blockly.CollapsibleToolboxCategory');
-goog.module.declareLegacyNamespace();
 
 /* eslint-disable-next-line no-unused-vars */
 const ICollapsibleToolboxItem = goog.requireType('Blockly.ICollapsibleToolboxItem');

diff --git a/core/toolbox/separator.js b/core/toolbox/separator.js
@@ -12,7 +12,6 @@
 'use strict';
 
 goog.module('Blockly.ToolboxSeparator');
-goog.module.declareLegacyNamespace();
 
 const Css = goog.require('Blockly.Css');
 /* eslint-disable-next-line no-unused-vars */

diff --git a/core/toolbox/toolbox.js b/core/toolbox/toolbox.js
@@ -11,7 +11,6 @@
 'use strict';
 
 goog.module('Blockly.Toolbox');
-goog.module.declareLegacyNamespace();
 
 /* eslint-disable-next-line no-unused-vars */
 const BlocklyOptions = goog.requireType('Blockly.BlocklyOptions');

diff --git a/core/toolbox/toolbox_item.js b/core/toolbox/toolbox_item.js
@@ -11,7 +11,6 @@
 'use strict';
 
 goog.module('Blockly.ToolboxItem');
-goog.module.declareLegacyNamespace();
 
 /* eslint-disable-next-line no-unused-vars */
 const ICollapsibleToolboxItem = goog.requireType('Blockly.ICollapsibleToolboxItem');

diff --git a/tests/deps.js b/tests/deps.js
diff --git a/tests/deps.mocha.js b/tests/deps.mocha.js