Merge branch 'main' into renovate/typescript-4.x

Author: davidjgoss

package-lock.json

@@ -256,7 +256,7 @@
     "mocha": "9.1.3",
     "mustache": "4.2.0",
     "nyc": "15.1.0",
-    "prettier": "2.5.0",
+    "prettier": "2.5.1",
     "reindent-template-literals": "1.1.0",
     "semver": "7.3.5",
     "shx": "0.3.3",