[BUGFIX release-3-28] Fix #19867 #19868
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
mixonic
force-pushed
the
mixonic/explicit-injection-not-deprecated
branch
from
e88a74b to
9bcffb5
Compare
mixonic
force-pushed
the
mixonic/explicit-injection-not-deprecated
branch
from
9bcffb5 to
89e75a6
Compare
mixonic
force-pushed
the
mixonic/explicit-injection-not-deprecated
branch
2 times, most recently
from
6a84367 to
ae15deb
Compare
mixonic
added a commit
to mixonic/ember-data-store-sadness
that referenced
this pull request
Dec 2, 2021
mixonic
force-pushed
the
mixonic/explicit-injection-not-deprecated
branch
from
ae15deb to
2fbce60
Compare
|
@mixonic confirmed via https://github.com/ember-learn/ember-cli-addon-docs/pull/1030/checks and works like a charm on my local |
The way most Ember apps are setup in late 3.28 (an implicit injection of `store` but also an explicit injection) was not under test. This patch adds a test, and fixes a bug when applications use that pattern. The prior implementation of the `store` injection deprecation on routes (added in emberjs#19854) used a wrapper `DeprecatedStoreInjection` in some cases which was unwrapped by the store getter. A deprecation implemented on `CoreObject` for when a explicit and implicit deprecation mis-match conflicted with that logic. Here, refactor away from the `DeprecatedStoreInjection` wrapper to instead use a WeakSet to track injected instances.
mixonic
force-pushed
the
mixonic/explicit-injection-not-deprecated
branch
from
2fbce60 to
e4756aa
Compare
ef4
approved these changes
Dec 2, 2021
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #19867. Confirmed fix on the reproductions at jherdman/ember-data-store-sadness#1 and empress/empress-blog#148.
A build of this branch can be downloaded at https://gist.github.com/mixonic/fe502b7f84eba571b9bde80e78f1b720. You can try out the branch in your application with that build.
The way most Ember apps are setup in late 3.28 (an implicit injection of
storebut also an explicit injection) was not under test. This patch adds a test, and fixes a bug when applications use that pattern.The prior implementation of the
storeinjection deprecation on routes (added in #19854) used a wrapperDeprecatedStoreInjectionin some cases which was unwrapped by the store getter. A deprecation implemented onCoreObjectfor when a explicit and implicit deprecation mis-match conflicted with that logic.Here, refactor away from the
DeprecatedStoreInjectionwrapper to instead use a WeakSet to track injected instances. This does mean the deprecation is only going to fire in newer browsers (not in IE11), but I think that is acceptable.