Fix Merge Conflicts #4
Closed
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
bump babel-plugin, fixes ember-engines#419
…rnal and replaceWithExternal return a thenable Transition object
…rnal-fix Fixed transitionToExternal and replaceWithExternal to return thenable Transition objects
Update `lazyLoading` option to accept a hash
blueprint updates to conform with latest cli style
…gine-blueprint Use new `lazyLoading` format in `in-repo-engine` blueprint
moving lazy loading to completed
Use cacheKeyForTree to improve the addon dedup
…specific properties, instead of just string paths. Context: In our addon, we are importing a vendor file and specifying both a development and production (minified) version of the file. I received an error when trying to use the environment object version of the asset argument, which I traced down to the `asset.replace` (which assumes a string).
When `lazyLoading === true`, `target` is an addon instance (and not the `ember-app` instance). Since addons do not normally have an `.env` property, we copy it over from the original host.
Make addons accept asset objects /w environment properties
Introduce `lazyLoading.includeRoutesInApplication` option
|
Closing in favor of ember-engines#444 |
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.
No description provided.