Allow ember-cli-htmlbars-inline-precompile 2.x and 1.x #481
+19
−10
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
|
Hmm, not entirely sure how to get the tests to pass - any pointers? |
rwjblue
reviewed
Nov 21, 2018
rwjblue
approved these changes
Nov 21, 2018
|
Hmm, that fixes the 2.12 test, but not the ones before that.. not sure what the cause is there, any ideas? |
rwjblue
reviewed
Nov 21, 2018
config/ember-try.js
Outdated
| @@ -24,6 +24,7 @@ module.exports = function() { | |||
| }, | |||
| npm: { | |||
| devDependencies: { | |||
| 'ember-cli-htmlbars-inline-precompile': '~1.0.5', | |||
There was a problem hiding this comment.
I think this needs to be moved to dependencies (not devDependencies), otherwise we would have dependencies of 2.0.0 and devDependencies of 1.0.5 and my guess is that yarn chooses dependencies to "win" over dev deps.
Also can you change these to ^1.0.5
config/ember-try.js
Outdated
| @@ -68,6 +71,7 @@ module.exports = function() { | |||
| name: 'ember-lts-2.12', | |||
| npm: { | |||
| devDependencies: { | |||
| 'ember-cli-htmlbars-inline-precompile': '~1.0.5', | |||
There was a problem hiding this comment.
I don't think we need any modification to this one (since 2.12 already comes from npm and is supported by 2.0.0 of ember-cli-htmlbars-inline-precompile).
mydea
force-pushed
the
ember-cli-htmlbars-inline-precompile-versions
branch
from
183bb45 to
acd2bda
Compare
|
Yeah, that did the tick - I added it to |
rwjblue
approved these changes
Nov 26, 2018
|
Thank you @mydea! |
rwjblue
added a commit
to rwjblue/ember-qunit
that referenced
this pull request
Dec 10, 2018
\#### 🚀 Enhancement * [emberjs#498](emberjs/ember-test-helpers#498) Add ability to opt-out of automatic settledness waiting in teardown. ([@rwjblue](https://github.com/rwjblue)) \#### 🐛 Bug Fix * [emberjs#497](emberjs/ember-test-helpers#497) Only customize RSVP's async for Ember older than 1.7. ([@rwjblue](https://github.com/rwjblue)) * [emberjs#481](emberjs/ember-test-helpers#481) Allow ember-cli-htmlbars-inline-precompile 2.x and 1.x ([@mydea](https://github.com/mydea)) \#### 🏠 Internal * [emberjs#491](emberjs/ember-test-helpers#491) TravisCI: Remove deprecated `sudo: false` option ([@Turbo87](https://github.com/Turbo87)) * [emberjs#480](emberjs/ember-test-helpers#480) Extract Prettier configuration to .prettierrc.js file. ([@rwjblue](https://github.com/rwjblue)) * [emberjs#463](emberjs/ember-test-helpers#463) Improve type declarations ([@Turbo87](https://github.com/Turbo87)) \#### Committers: 4 - Francesco Novy ([@mydea](https://github.com/mydea)) - Peter Wagenet ([@wagenet](https://github.com/wagenet)) - Robert Jackson ([@rwjblue](https://github.com/rwjblue)) - Tobias Bieniek ([@Turbo87](https://github.com/Turbo87))
This was referenced Dec 10, 2018
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.
See #468
This PR allows ember-cli-htmlbars-inline-precompile 2.x as well as 1.x, to continue supporting Ember <= 2.12.