Merge pull request #4976 from google/rc_2021_7

Rc 2021 7

.eslintrc.json

@@ -72,8 +72,7 @@
                 "balanced": true
             },
             "exceptions": ["*"]
-        }],
-        "es5/no-es6-methods": ["warn"]
+        }]
     },
     "env": {
         "browser": true
@@ -83,7 +82,6 @@
         "goog": true
     },
     "extends": [
-        "eslint:recommended",
-        "plugin:es5/no-es2015"
+        "eslint:recommended"
     ]
 }

.github/dependabot.yml

@@ -10,3 +10,9 @@ updates:
     target-branch: "develop"
     schedule:
       interval: "weekly"
+    ignore:
+      - dependency-name: "jsdom"
+        # For jsdom, ignore all updates for version 16.
+        # We should test that this does not cause issue 
+        # google/blockly-samples#665 when version 17 is released.
+        versions: "16.x"

.github/workflows/build.yml

@@ -7,12 +7,14 @@ on: [pull_request]
 
 jobs:
   build:
-    # TODO (#2114): re-enable osx build.
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.os }}
 
     strategy:
       matrix:
-        node-version: [10.x, 12.x, 14.x]
+        # TODO (#2114): re-enable osx build.
+        # os: [ubuntu-latest, macos-latest]
+        os: [ubuntu-latest]
+        node-version: [10.x, 12.x, 14.x, 16.x]
         # See supported Node.js release schedule at https://nodejs.org/en/about/releases/
 
     steps:
@@ -35,7 +37,7 @@ jobs:
       run: source ./tests/scripts/setup_osx_env.sh
 
     - name: Run
-      run: npm run test:run
+      run: npm run test
 
       env:
         CI: true

README.md

@@ -41,7 +41,7 @@ Want to make Blockly better? We welcome contributions to Blockly in the form of
 
 ## Releases
 
-The next major release will be **March 25th, 2021**.
+The next major release will be **September 30th, 2021**.
 
 We release by pushing the latest code to the master branch, followed by updating the npm package, our [docs](https://developers.google.com/blockly), and [demo pages](https://google.github.io/blockly-samples/). We typically release a new version of Blockly once a quarter (every 3 months). If there are breaking bugs, such as a crash when performing a standard action or a rendering issue that makes Blockly unusable, we will cherry-pick fixes to master between releases to fix them. The [releases page](https://github.com/google/blockly/releases) has a list of all releases.
 

appengine/.gcloudignore

@@ -11,7 +11,6 @@ deploy
 /static/scripts/
 /static/typings/
 
-/static/build.py
 /static/eslintrc.json
 /static/gulpfile.js
 /static/jsconfig.json

blocks/lists.js

@@ -15,7 +15,6 @@
  */
 'use strict';
 
-goog.provide('Blockly.Blocks.lists');  // Deprecated
 goog.provide('Blockly.Constants.Lists');
 
 goog.require('Blockly');

blocks/logic.js

@@ -473,9 +473,9 @@ Blockly.Constants.Logic.CONTROLS_IF_MUTATOR_MIXIN = {
   },
   /**
    * Reconnects child blocks.
-   * @param {!Array.<?Blockly.RenderedConnection>} valueConnections List of
+   * @param {!Array<?Blockly.RenderedConnection>} valueConnections List of
    * value connections for 'if' input.
-   * @param {!Array.<?Blockly.RenderedConnection>} statementConnections List of
+   * @param {!Array<?Blockly.RenderedConnection>} statementConnections List of
    * statement connections for 'do' input.
    * @param {?Blockly.RenderedConnection} elseStatementConnection Statement
    * connection for else input.

blocks/procedures.js

@@ -264,15 +264,15 @@ Blockly.Blocks['procedures_defnoreturn'] = {
   },
   /**
    * Return all variables referenced by this block.
-   * @return {!Array.<string>} List of variable names.
+   * @return {!Array<string>} List of variable names.
    * @this {Blockly.Block}
    */
   getVars: function() {
     return this.arguments_;
   },
   /**
    * Return all variables referenced by this block.
-   * @return {!Array.<!Blockly.VariableModel>} List of variable models.
+   * @return {!Array<!Blockly.VariableModel>} List of variable models.
    * @this {Blockly.Block}
    */
   getVarModels: function() {
@@ -634,8 +634,8 @@ Blockly.Blocks['procedures_callnoreturn'] = {
   },
   /**
    * Notification that the procedure's parameters have changed.
-   * @param {!Array.<string>} paramNames New param names, e.g. ['x', 'y', 'z'].
-   * @param {!Array.<string>} paramIds IDs of params (consistent for each
+   * @param {!Array<string>} paramNames New param names, e.g. ['x', 'y', 'z'].
+   * @param {!Array<string>} paramIds IDs of params (consistent for each
    *     parameter through the life of a mutator, regardless of param renaming),
    *     e.g. ['piua', 'f8b_', 'oi.o'].
    * @private
@@ -809,15 +809,15 @@ Blockly.Blocks['procedures_callnoreturn'] = {
   },
   /**
    * Return all variables referenced by this block.
-   * @return {!Array.<string>} List of variable names.
+   * @return {!Array<string>} List of variable names.
    * @this {Blockly.Block}
    */
   getVars: function() {
     return this.arguments_;
   },
   /**
    * Return all variables referenced by this block.
-   * @return {!Array.<!Blockly.VariableModel>} List of variable models.
+   * @return {!Array<!Blockly.VariableModel>} List of variable models.
    * @this {Blockly.Block}
    */
   getVarModels: function() {