Merge branch 'master' into middleware-options

Author: jamescdavis

package.json

@@ -126,7 +126,7 @@
     "rimraf": "3.0.2",
     "testdouble": "3.16.0",
     "ts-node": "8.10.2",
-    "typescript": "3.7.5"
+    "typescript": "3.9.6"
   },
   "resolutions": {
     "@types/ember": "3.1.2",

yarn.lock

@@ -16520,12 +16520,7 @@ typescript-memoize@^1.0.0-alpha.3:
   dependencies:
     core-js "2.4.1"
 
-typescript@3.7.5:
-  version "3.7.5"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.7.5.tgz#0692e21f65fd4108b9330238aac11dd2e177a1ae"
-  integrity sha512-/P5lkRXkWHNAbcJIiHPfRoKqyd7bsyCma1hZNUGfn20qm64T6ZBlrzprymeu918H+mB/0rIg2gGK/BXkhhYgBw==
-
-typescript@^3.9.3:
+typescript@3.9.6, typescript@^3.9.3:
   version "3.9.6"
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.9.6.tgz#8f3e0198a34c3ae17091b35571d3afd31999365a"
   integrity sha512-Pspx3oKAPJtjNwE92YS05HQoY7z2SFyOpHo9MqJor3BXAGNaPUs83CuVp9VISFkSjyRfiTpmKuAYGJB7S7hOxw==