Merge pull request #6707 from emberjs/lambda-beta/7279589

Keeping beta up to date

packages/adapter/addon/rest.js

@@ -294,8 +294,18 @@ const RESTAdapter = Adapter.extend(BuildURLMixin, {
 
   _defaultContentType: 'application/json; charset=utf-8',
 
-  fastboot: computed(function() {
-    return getOwner(this).lookup('service:fastboot');
+  fastboot: computed({
+    // Avoid computed property override deprecation in fastboot as suggested by:
+    // https://deprecations.emberjs.com/v3.x/#toc_computed-property-override
+    get() {
+      if (this._fastboot) {
+        return this._fastboot;
+      }
+      return getOwner(this).lookup('service:fastboot');
+    },
+    set(key, value) {
+      this._fastboot = value;
+    },
   }),
 
   useFetch: computed(function() {

tsconfig.json

@@ -34,7 +34,9 @@
       "@ember-data/record-data/*": ["packages/record-data/addon/*"],
       "@ember-data/canary-features": ["packages/canary-features/addon"],
       "@ember-data/canary-features/*": ["packages/canary-features/addon/*"],
-      "*": ["packages/store/types/*", "packages/record-data/types/*"]
+      "fastboot-test-app/tests/*": ["tests/*"],
+      "fastboot-test-app/*": ["app/*"],
+      "*": ["packages/store/types/*", "packages/record-data/types/*", "packages/fastboot-test-app/types/*"]
     }
   },
   "include": [