Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[BUGFIX RELEASE BETA CANARY] Fastboot issues #6683

Merged
merged 2 commits into from
Nov 8, 2019
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 12 additions & 2 deletions packages/adapter/addon/rest.js
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
33 changes: 28 additions & 5 deletions packages/unpublished-fastboot-test-app/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,34 @@
{
"extends": "../../tsconfig.json",
"baseUrl": "../..",
"compilerOptions": {
"paths": {
"fastboot-test-app/tests/*": ["tests/*"],
"fastboot-test-app/*": ["app/*"],
"*": ["types/*"]
"ember-data": ["packages/-ember-data/addon"],
runspired marked this conversation as resolved.
Show resolved Hide resolved
"ember-data/*": ["packages/-ember-data/addon/*"],
"@ember-data/store": ["packages/store/addon"],
"@ember-data/store/*": ["packages/store/addon/*"],
"@ember-data/debug": ["packages/debug/addon"],
"@ember-data/debug/*": ["packages/debug/addon/*"],
"@ember-data/model": ["packages/model/addon"],
"@ember-data/model/*": ["packages/model/addon/*"],
"@ember-data/adapter": ["packages/adapter/addon"],
"@ember-data/adapter/*": ["packages/adapter/addon/*"],
"@ember-data/adapter/error": ["packages/adapter/addon/error"],
"@ember-data/serializer": ["packages/serializer/addon"],
"@ember-data/serializer/*": ["packages/serializer/addon/*"],
"ember-data/test-support": ["packages/-ember-data/addon-test-support"],
"ember-data/test-support/*": ["packages/-ember-data/addon-test-support/*"],
"@ember-data/record-data": ["packages/record-data/addon"],
"@ember-data/record-data/*": ["packages/record-data/addon/*"],
"@ember-data/canary-features": ["packages/canary-features/addon"],
"@ember-data/canary-features/*": ["packages/canary-features/addon/*"],
"fastboot-test-app/tests/*": ["packages/unpublished-fastboot-test-app/tests/*"],
"fastboot-test-app/*": ["packages/unpublished-fastboot-test-app/app/*"],
"*": [
"packages/store/types/*",
"packages/record-data/types/*",
"packages/unpublished-fastboot-test-app/types/*"
]
}
},
"include": ["app/**/*", "tests/**/*", "types/**/*"]
}
}