Merge pull request #5019 from cpcallen/goog.module-prep

Preparation for goog.module transition: base.js, deps.js
google · Jul 13, 2021 · 8b81043 · 8b81043
2 parents de1b321 + d313ec8
commit 8b81043
Show file tree

Hide file tree

Showing 12 changed files with 3,872 additions and 559 deletions.
diff --git a/.eslintignore b/.eslintignore
@@ -1,5 +1,4 @@
 *_compressed*.js
-*_uncompressed*.js
 gulpfile.js
 /msg/*
 /build/*

diff --git a/.eslintrc.json b/.eslintrc.json
@@ -79,7 +79,8 @@
     },
     "globals": {
         "Blockly": true,
-        "goog": true
+        "goog": true,
+        "exports": true
     },
     "extends": [
         "eslint:recommended"

diff --git a/blockly_uncompressed.js b/blockly_uncompressed.js
diff --git a/blocks/procedures.js b/blocks/procedures.js
@@ -519,7 +519,7 @@ Blockly.Blocks['procedures_mutatorarg'] = {
    * @param {string} varName User-supplied name.
    * @return {?string} Valid name, or null if a name was not specified.
    * @private
-   * @this Blockly.FieldTextInput
+   * @this {Blockly.FieldTextInput}
    */
   validator_: function(varName) {
     var sourceBlock = this.getSourceBlock();
@@ -571,7 +571,7 @@ Blockly.Blocks['procedures_mutatorarg'] = {
    * variable name.
    * @param {string} newText The new variable name.
    * @private
-   * @this Blockly.FieldTextInput
+   * @this {Blockly.FieldTextInput}
    */
   deleteIntermediateVars_: function(newText) {
     var outerWs = Blockly.Mutator.findParentWs(this.getSourceBlock().workspace);