From 3be64d78aabdd96e8fac284b61f9673f46f8c419 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Tue, 17 Aug 2021 12:38:47 -0700
Subject: [PATCH] Migrate core/theme/classic.js to goog.module

---
 core/theme/classic.js | 17 ++++++++++-------
 tests/deps.js         |  2 +-
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/core/theme/classic.js b/core/theme/classic.js
index 5c128eb18..513c6c212 100644
--- a/core/theme/classic.js
+++ b/core/theme/classic.js
@@ -10,15 +10,16 @@
  */
 'use strict';
 
-goog.provide('Blockly.Themes.Classic');
+goog.module('Blockly.Themes.Classic');
+goog.module.declareLegacyNamespace();
 
 goog.require('Blockly.Theme');
 
 
 // Temporary holding object.
-Blockly.Themes.Classic = {};
+let Classic = {};
 
-Blockly.Themes.Classic.defaultBlockStyles = {
+Classic.defaultBlockStyles = {
   "colour_blocks": {
     "colourPrimary": "20"
   },
@@ -52,7 +53,7 @@ Blockly.Themes.Classic.defaultBlockStyles = {
   }
 };
 
-Blockly.Themes.Classic.categoryStyles = {
+Classic.categoryStyles = {
   "colour_category": {
     "colour": "20"
   },
@@ -82,6 +83,8 @@ Blockly.Themes.Classic.categoryStyles = {
   }
 };
 
-Blockly.Themes.Classic =
-    new Blockly.Theme('classic', Blockly.Themes.Classic.defaultBlockStyles,
-        Blockly.Themes.Classic.categoryStyles);
+Classic =
+    new Blockly.Theme('classic', Classic.defaultBlockStyles,
+        Classic.categoryStyles);
+
+exports = Classic;
diff --git a/tests/deps.js b/tests/deps.js
index 8e1c3d6fb..a9808465d 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -191,7 +191,7 @@ goog.addDependency('../../core/scrollbar_pair.js', ['Blockly.ScrollbarPair'], ['
 goog.addDependency('../../core/shortcut_items.js', ['Blockly.ShortcutItems'], ['Blockly', 'Blockly.Gesture', 'Blockly.ShortcutRegistry', 'Blockly.clipboard', 'Blockly.utils.KeyCodes'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/shortcut_registry.js', ['Blockly.ShortcutRegistry'], ['Blockly.utils.KeyCodes', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/theme.js', ['Blockly.Theme'], ['Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/theme/classic.js', ['Blockly.Themes.Classic'], ['Blockly.Theme']);
+goog.addDependency('../../core/theme/classic.js', ['Blockly.Themes.Classic'], ['Blockly.Theme'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/theme/zelos.js', ['Blockly.Themes.Zelos'], ['Blockly.Theme'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/theme_manager.js', ['Blockly.ThemeManager'], ['Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/toolbox/category.js', ['Blockly.ToolboxCategory'], ['Blockly', 'Blockly.Css', 'Blockly.ToolboxItem', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});