Merge branch 'master' into beta

Author: jayair

package.json

@@ -89,6 +89,9 @@
     "reflect-metadata": "^0.1.13",
     "serverless": "^2.37.1"
   },
+  "peerDependencies": {
+    "serverless": "1 || 2"
+  },
   "lint-staged": {
     "*.{js,css,json,md}": [
       "prettier --write",

scripts/config/createJestConfig.js

@@ -43,17 +43,22 @@ module.exports = (resolve, rootDir) => {
   }
   const overrides = Object.assign({}, require(paths.appPackageJson).jest);
   const supportedKeys = [
+    "clearMocks",
     "collectCoverageFrom",
+    "coveragePathIgnorePatterns",
     "coverageReporters",
     "coverageThreshold",
+    "displayName",
     "extraGlobals",
     "globalSetup",
     "globalTeardown",
     "reporters",
     "resetMocks",
     "resetModules",
+    "restoreMocks",
     "setupFilesAfterEnv",
     "snapshotSerializers",
+    "testMatch",
     "testResultsProcessor",
     "transform",
     "transformIgnorePatterns",