Merge branch 'main' into update-sheet-height

Author: arjunlalb

package-lock.json

@@ -107,15 +107,15 @@
     "jest-junit": "^13.0.0",
     "jest-preset-angular": "^8.4.0",
     "lodash": "^4.17.21",
-    "ng-mocks": "^13.3.0",
+    "ng-mocks": "^13.4.0",
     "ng-packagr": "^12.2.5",
     "prettier": "^2.2.1",
     "pretty-quick": "^3.1.3",
     "ts-node": "~10.7.0",
     "tslint": "~6.1.3",
     "tslint-config-prettier": "^1.18.0",
     "typescript": "~4.3.5",
-    "typescript-tslint-plugin": "^1.0.1"
+    "typescript-tslint-plugin": "^1.0.2"
   },
   "config": {
     "commitizen": {