From 88334bea80aa26c08705f16aba5e79dd708158f9 Mon Sep 17 00:00:00 2001
From: Christopher Allen <cpcallen+git@google.com>
Date: Tue, 1 Mar 2022 16:30:58 +0000
Subject: [PATCH] fix(tests): Enable --debug for test:compile:advanced; fix
 some errors (#5959)

* Enable the --debug flag when running the
  buildAdvancedCompilationTest gulp task.
* Migrate test/compile/main.js to goog.module.
  * Use more selective goog.requires.
    * Reduces compiled size from ~400k to ~370k.
  * @suppress "extra" requires needed for side effects.
---
 package.json          |  2 +-
 tests/compile/main.js | 30 ++++++++++++++++++++++--------
 2 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/package.json b/package.json
index 88cc6c0efa3..149e38a61bf 100644
--- a/package.json
+++ b/package.json
@@ -51,7 +51,7 @@
     "test": "tests/run_all_tests.sh",
     "test:generators": "tests/scripts/run_generators.sh",
     "test:mocha:interactive": "http-server ./ -o /tests/mocha/index.html -c-1",
-    "test:compile:advanced": "gulp buildAdvancedCompilationTest",
+    "test:compile:advanced": "gulp buildAdvancedCompilationTest --debug",
     "typings": "gulp typings",
     "updateGithubPages": "gulp gitUpdateGithubPages"
   },
diff --git a/tests/compile/main.js b/tests/compile/main.js
index 586f4ce3648..b5d20a770cd 100644
--- a/tests/compile/main.js
+++ b/tests/compile/main.js
@@ -4,19 +4,33 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-goog.provide('Main');
+goog.module('Main');
+
 // Core
 // Either require 'Blockly.requires', or just the components you use:
-goog.require('Blockly');
+/* eslint-disable-next-line no-unused-vars */
+const {BlocklyOptions} = goog.requireType('Blockly.BlocklyOptions');
+const {inject} = goog.require('Blockly.inject');
+/** @suppress {extraRequire} */
 goog.require('Blockly.geras.Renderer');
+/** @suppress {extraRequire} */
 goog.require('Blockly.VerticalFlyout');
 // Blocks
-goog.require('Blockly.libraryBlocks');
+/** @suppress {extraRequire} */
+goog.require('Blockly.libraryBlocks.logic');
+/** @suppress {extraRequire} */
+goog.require('Blockly.libraryBlocks.loops');
+/** @suppress {extraRequire} */
+goog.require('Blockly.libraryBlocks.math');
+/** @suppress {extraRequire} */
+goog.require('Blockly.libraryBlocks.texts');
+/** @suppress {extraRequire} */
 goog.require('Blockly.libraryBlocks.testBlocks');
 
-Main.init = function() {
-  Blockly.inject('blocklyDiv', {
-    'toolbox': document.getElementById('toolbox')
-  });
+
+function init() {
+  inject('blocklyDiv', /** @type {BlocklyOptions} */ ({
+           'toolbox': document.getElementById('toolbox')
+         }));
 };
-window.addEventListener('load', Main.init);
+window.addEventListener('load', init);