Merge branch 'modern-blockly' into spork

Author: cwillisf

package-lock.json

@@ -32,9 +32,9 @@
     "webpack-dev-server": "^4.11.1"
   },
   "dependencies": {
-    "@blockly/continuous-toolbox": "^6.0.9",
-    "@blockly/field-colour": "^5.0.9",
-    "blockly": "^12.0.0-beta.0"
+    "@blockly/continuous-toolbox": "^7.0.0-beta.1",
+    "@blockly/field-colour": "^4.0.2",
+    "blockly": "^12.0.0-beta.1"
   },
   "config": {
     "commitizen": {