Merge branch 'develop' of https://github.com/google/blockly into develop

.clang-format

@@ -0,0 +1,3 @@
+Language:        JavaScript
+BasedOnStyle:    Google
+ColumnLimit:     80

package-lock.json

@@ -1399,6 +1399,25 @@
         }
       }
     },
+    "clang-format": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/clang-format/-/clang-format-1.5.0.tgz",
+      "integrity": "sha512-C1LucFX7E+ABVYcPEbBHM4PYQ2+WInXsqsLpFlQ9cmRfSbk7A7b1I06h/nE4bQ3MsyEkb31jY2gC0Dtc76b4IA==",
+      "dev": true,
+      "requires": {
+        "async": "^1.5.2",
+        "glob": "^7.0.0",
+        "resolve": "^1.1.6"
+      },
+      "dependencies": {
+        "async": {
+          "version": "1.5.2",
+          "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz",
+          "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=",
+          "dev": true
+        }
+      }
+    },
     "class-utils": {
       "version": "0.3.6",
       "resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz",

package.json

@@ -30,6 +30,7 @@
     "build:uncompressed": "gulp buildUncompressed",
     "bump": "npm --no-git-tag-version version 4.$(date +'%Y%m%d').0",
     "deployDemos": "gulp deployDemos",
+    "format": "git-clang-format",
     "license": "gulp checkLicenses",
     "lint": "eslint .",
     "package": "gulp package",
@@ -61,6 +62,7 @@
     "@blockly/theme-modern": "^2.1.1",
     "babel-eslint": "^10.1.0",
     "chai": "^4.2.0",
+    "clang-format": "^1.5.0",
     "concurrently": "^5.3.0",
     "eslint": "^7.6.0",
     "eslint-plugin-es5": "^1.5.0",