diff --git a/package-lock.json b/package-lock.json
index 21c8b2e41ae..0dee55dd2df 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -5,7 +5,6 @@
   "requires": true,
   "packages": {
     "": {
-      "name": "blockly",
       "version": "7.20211209.0",
       "license": "Apache-2.0",
       "dependencies": {
@@ -13,7 +12,7 @@
       },
       "devDependencies": {
         "@blockly/block-test": "^1.0.0",
-        "@blockly/dev-tools": "^2.6.1",
+        "@blockly/dev-tools": "^3.0.1",
         "@blockly/theme-modern": "^2.1.1",
         "@wdio/selenium-standalone-service": "^7.10.1",
         "chai": "^4.2.0",
@@ -165,16 +164,16 @@
       }
     },
     "node_modules/@blockly/dev-tools": {
-      "version": "2.6.1",
-      "resolved": "https://registry.npmjs.org/@blockly/dev-tools/-/dev-tools-2.6.1.tgz",
-      "integrity": "sha512-mv7u3x/Z2qA2PCSPomz0S4ofQn+m/UHC/AoNu1FZuwNAwuE5SCy7HCTDracpKWqoK8iuXwi4PWUdu669CDbp5A==",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/@blockly/dev-tools/-/dev-tools-3.0.1.tgz",
+      "integrity": "sha512-afFCokPWHKeFrZRSoHa0oBBUWIwqI02/svYPRTjviEsxGcU89nG/bYBpfG9Fosm8hEKROvZf7/bIMn0x1KlCBA==",
       "dev": true,
       "dependencies": {
-        "@blockly/block-test": "^1.1.5",
-        "@blockly/theme-dark": "^2.0.6",
-        "@blockly/theme-deuteranopia": "^1.0.7",
-        "@blockly/theme-highcontrast": "^1.0.7",
-        "@blockly/theme-tritanopia": "^1.0.7",
+        "@blockly/block-test": "^2.0.1",
+        "@blockly/theme-dark": "^2.0.7",
+        "@blockly/theme-deuteranopia": "^1.0.8",
+        "@blockly/theme-highcontrast": "^1.0.8",
+        "@blockly/theme-tritanopia": "^1.0.8",
         "chai": "^4.2.0",
         "dat.gui": "^0.7.7",
         "lodash.assign": "^4.2.0",
@@ -186,43 +185,55 @@
         "node": ">=8.0.0"
       },
       "peerDependencies": {
-        "blockly": "4.20201217.0 - 6"
+        "blockly": "^7.20211209.0"
+      }
+    },
+    "node_modules/@blockly/dev-tools/node_modules/@blockly/block-test": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/@blockly/block-test/-/block-test-2.0.1.tgz",
+      "integrity": "sha512-d8E109UEWTtFv1bfy5paQNk9HYdZDWH5S7qkCrlKTtSatPDt8f3SGCr/lu8JC086/LhjRafgX1RTa0uwJIDDdg==",
+      "dev": true,
+      "engines": {
+        "node": ">=8.17.0"
+      },
+      "peerDependencies": {
+        "blockly": "^7.20211209.0"
       }
     },
     "node_modules/@blockly/theme-dark": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/@blockly/theme-dark/-/theme-dark-2.0.6.tgz",
-      "integrity": "sha512-2gPz3Iw+VjBFaNhoYXm/zRA2Xhe/nDnpOyPxbav7sGs4XcO4F0yPruuXxBm7oGGbGudmxmJXhTdmV+4d8MpvSg==",
+      "version": "2.0.7",
+      "resolved": "https://registry.npmjs.org/@blockly/theme-dark/-/theme-dark-2.0.7.tgz",
+      "integrity": "sha512-sErL00Uaa0yBviBWpNT0tobaty5BYb+xbE3LwSsot7P/4u/j+pD+oKS8fqt8xsWxbtn67zL8PARmaP3KVe4+Aw==",
       "dev": true,
       "engines": {
         "node": ">=8.17.0"
       },
       "peerDependencies": {
-        "blockly": "3.20200123.0 - 6"
+        "blockly": "3.20200123.0 - 7"
       }
     },
     "node_modules/@blockly/theme-deuteranopia": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/@blockly/theme-deuteranopia/-/theme-deuteranopia-1.0.7.tgz",
-      "integrity": "sha512-m2Jo6lCYnVn3eLzmBoSBN31t2qQ8fAjEJmcUBcpJ56TGB1gks1vGVJHg/yhcK+vUB85IFuUUUJ6+MOjhEZFOvQ==",
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/@blockly/theme-deuteranopia/-/theme-deuteranopia-1.0.8.tgz",
+      "integrity": "sha512-/9aDJCUuyDJ4OSHr2lCJRpqBLSvgV8YP7uCeCKuoY3uMnMKTxEcJ/AUma+oF98os+i3/GeNzCMYQ/6bdlCXRIQ==",
       "dev": true,
       "engines": {
         "node": ">=8.17.0"
       },
       "peerDependencies": {
-        "blockly": "3.20200123.0 - 6"
+        "blockly": "3.20200123.0 - 7"
       }
     },
     "node_modules/@blockly/theme-highcontrast": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/@blockly/theme-highcontrast/-/theme-highcontrast-1.0.7.tgz",
-      "integrity": "sha512-FI/LyP/gGCatpeKvKTLSyColgyHETKSFo5RrgbZ+GTgVAQxXAj7MQ4DZDtlWECOKaT6WGQLNk5OserBXMCtDbQ==",
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/@blockly/theme-highcontrast/-/theme-highcontrast-1.0.8.tgz",
+      "integrity": "sha512-A9bvQpmNtsn3W3pWa0NRttBm1IeIhV6zGAp4ziY+GU0kNGZDgbrP10JJKfz3dv+RCaXmslE9kS25RU/LYJjB/Q==",
       "dev": true,
       "engines": {
         "node": ">=8.17.0"
       },
       "peerDependencies": {
-        "blockly": "3.20200123.0 - 6"
+        "blockly": "3.20200123.0 - 7"
       }
     },
     "node_modules/@blockly/theme-modern": {
@@ -238,15 +249,15 @@
       }
     },
     "node_modules/@blockly/theme-tritanopia": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/@blockly/theme-tritanopia/-/theme-tritanopia-1.0.7.tgz",
-      "integrity": "sha512-Y6d8ZR3y9iz1GdihHbSYGTIwWEanWtp0tYPtsVx3QlcKMuc+NyAtGQVE324ZTA+N1ayH4L31CGRAAo7AAm3gPA==",
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/@blockly/theme-tritanopia/-/theme-tritanopia-1.0.8.tgz",
+      "integrity": "sha512-61G8VB5a8F9eRMYAXpeRia/DrRRfAnUqpA62pksvtcRwMoztwhToUHHkSYuOHxpDpKG/rTlaFtf/GUHFFaFHEQ==",
       "dev": true,
       "engines": {
         "node": ">=8.17.0"
       },
       "peerDependencies": {
-        "blockly": "3.20200123.0 - 6"
+        "blockly": "3.20200123.0 - 7"
       }
     },
     "node_modules/@eslint/eslintrc": {
@@ -11089,9 +11100,9 @@
       "dev": true
     },
     "node_modules/typescript": {
-      "version": "4.5.2",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.5.2.tgz",
-      "integrity": "sha512-5BlMof9H1yGt0P8/WF+wPNw6GfctgGjXp5hkblpyT+8rkASSmkUKMXrxR0Xg8ThVCi/JnHQiKXeBaEwCeQwMFw==",
+      "version": "4.5.4",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.5.4.tgz",
+      "integrity": "sha512-VgYs2A2QIRuGphtzFV7aQJduJ2gyfTljngLzjpfW9FoYZF6xuw1W0vW9ghCKLfcWrCFxK81CSGRAvS1pn4fIUg==",
       "dev": true,
       "bin": {
         "tsc": "bin/tsc",
@@ -12095,42 +12106,51 @@
       "requires": {}
     },
     "@blockly/dev-tools": {
-      "version": "2.6.1",
-      "resolved": "https://registry.npmjs.org/@blockly/dev-tools/-/dev-tools-2.6.1.tgz",
-      "integrity": "sha512-mv7u3x/Z2qA2PCSPomz0S4ofQn+m/UHC/AoNu1FZuwNAwuE5SCy7HCTDracpKWqoK8iuXwi4PWUdu669CDbp5A==",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/@blockly/dev-tools/-/dev-tools-3.0.1.tgz",
+      "integrity": "sha512-afFCokPWHKeFrZRSoHa0oBBUWIwqI02/svYPRTjviEsxGcU89nG/bYBpfG9Fosm8hEKROvZf7/bIMn0x1KlCBA==",
       "dev": true,
       "requires": {
-        "@blockly/block-test": "^1.1.5",
-        "@blockly/theme-dark": "^2.0.6",
-        "@blockly/theme-deuteranopia": "^1.0.7",
-        "@blockly/theme-highcontrast": "^1.0.7",
-        "@blockly/theme-tritanopia": "^1.0.7",
+        "@blockly/block-test": "^2.0.1",
+        "@blockly/theme-dark": "^2.0.7",
+        "@blockly/theme-deuteranopia": "^1.0.8",
+        "@blockly/theme-highcontrast": "^1.0.8",
+        "@blockly/theme-tritanopia": "^1.0.8",
         "chai": "^4.2.0",
         "dat.gui": "^0.7.7",
         "lodash.assign": "^4.2.0",
         "lodash.merge": "^4.6.2",
         "monaco-editor": "^0.20.0",
         "sinon": "^9.0.2"
+      },
+      "dependencies": {
+        "@blockly/block-test": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/@blockly/block-test/-/block-test-2.0.1.tgz",
+          "integrity": "sha512-d8E109UEWTtFv1bfy5paQNk9HYdZDWH5S7qkCrlKTtSatPDt8f3SGCr/lu8JC086/LhjRafgX1RTa0uwJIDDdg==",
+          "dev": true,
+          "requires": {}
+        }
       }
     },
     "@blockly/theme-dark": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/@blockly/theme-dark/-/theme-dark-2.0.6.tgz",
-      "integrity": "sha512-2gPz3Iw+VjBFaNhoYXm/zRA2Xhe/nDnpOyPxbav7sGs4XcO4F0yPruuXxBm7oGGbGudmxmJXhTdmV+4d8MpvSg==",
+      "version": "2.0.7",
+      "resolved": "https://registry.npmjs.org/@blockly/theme-dark/-/theme-dark-2.0.7.tgz",
+      "integrity": "sha512-sErL00Uaa0yBviBWpNT0tobaty5BYb+xbE3LwSsot7P/4u/j+pD+oKS8fqt8xsWxbtn67zL8PARmaP3KVe4+Aw==",
       "dev": true,
       "requires": {}
     },
     "@blockly/theme-deuteranopia": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/@blockly/theme-deuteranopia/-/theme-deuteranopia-1.0.7.tgz",
-      "integrity": "sha512-m2Jo6lCYnVn3eLzmBoSBN31t2qQ8fAjEJmcUBcpJ56TGB1gks1vGVJHg/yhcK+vUB85IFuUUUJ6+MOjhEZFOvQ==",
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/@blockly/theme-deuteranopia/-/theme-deuteranopia-1.0.8.tgz",
+      "integrity": "sha512-/9aDJCUuyDJ4OSHr2lCJRpqBLSvgV8YP7uCeCKuoY3uMnMKTxEcJ/AUma+oF98os+i3/GeNzCMYQ/6bdlCXRIQ==",
       "dev": true,
       "requires": {}
     },
     "@blockly/theme-highcontrast": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/@blockly/theme-highcontrast/-/theme-highcontrast-1.0.7.tgz",
-      "integrity": "sha512-FI/LyP/gGCatpeKvKTLSyColgyHETKSFo5RrgbZ+GTgVAQxXAj7MQ4DZDtlWECOKaT6WGQLNk5OserBXMCtDbQ==",
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/@blockly/theme-highcontrast/-/theme-highcontrast-1.0.8.tgz",
+      "integrity": "sha512-A9bvQpmNtsn3W3pWa0NRttBm1IeIhV6zGAp4ziY+GU0kNGZDgbrP10JJKfz3dv+RCaXmslE9kS25RU/LYJjB/Q==",
       "dev": true,
       "requires": {}
     },
@@ -12142,9 +12162,9 @@
       "requires": {}
     },
     "@blockly/theme-tritanopia": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/@blockly/theme-tritanopia/-/theme-tritanopia-1.0.7.tgz",
-      "integrity": "sha512-Y6d8ZR3y9iz1GdihHbSYGTIwWEanWtp0tYPtsVx3QlcKMuc+NyAtGQVE324ZTA+N1ayH4L31CGRAAo7AAm3gPA==",
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/@blockly/theme-tritanopia/-/theme-tritanopia-1.0.8.tgz",
+      "integrity": "sha512-61G8VB5a8F9eRMYAXpeRia/DrRRfAnUqpA62pksvtcRwMoztwhToUHHkSYuOHxpDpKG/rTlaFtf/GUHFFaFHEQ==",
       "dev": true,
       "requires": {}
     },
@@ -20885,9 +20905,9 @@
       "dev": true
     },
     "typescript": {
-      "version": "4.5.2",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.5.2.tgz",
-      "integrity": "sha512-5BlMof9H1yGt0P8/WF+wPNw6GfctgGjXp5hkblpyT+8rkASSmkUKMXrxR0Xg8ThVCi/JnHQiKXeBaEwCeQwMFw==",
+      "version": "4.5.4",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.5.4.tgz",
+      "integrity": "sha512-VgYs2A2QIRuGphtzFV7aQJduJ2gyfTljngLzjpfW9FoYZF6xuw1W0vW9ghCKLfcWrCFxK81CSGRAvS1pn4fIUg==",
       "dev": true
     },
     "ua-parser-js": {