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

[v4] check ember-cli-babel against our new minimum version #1074

Merged
merged 2 commits into from
Feb 5, 2020
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
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@
"ember-cli-addon-docs": "ember-learn/ember-cli-addon-docs#4f5bfd11",
"ember-cli-addon-docs-esdoc": "0.2.3",
"ember-cli-app-version": "3.2.0",
"ember-cli-babel": "7.13.2",
"ember-cli-babel": "7.17.0",
"ember-cli-blueprint-test-helpers": "0.19.2",
"ember-cli-dependency-checker": "3.2.0",
"ember-cli-deploy": "1.0.2",
Expand Down
5 changes: 2 additions & 3 deletions ts/addon.ts
Original file line number Diff line number Diff line change
Expand Up @@ -78,11 +78,10 @@ export default addon({
let babel = this.parent.addons.find(addon => addon.name === 'ember-cli-babel');
let version = babel && babel.pkg.version;

// TODO update this check and warning message once we have a Babel version to target
if (!babel || !(semver.gte(version!, '7.7.3') && semver.lt(version!, '8.0.0'))) {
if (!babel || !(semver.gte(version!, '7.17.0') && semver.lt(version!, '8.0.0'))) {
let versionString = babel ? `version ${babel.pkg.version}` : `no instance of ember-cli-babel`;
this.ui.writeWarnLine(
`ember-cli-typescript requires ember-cli-babel ^7.7.3, but you have ${versionString} installed; ` +
`ember-cli-typescript requires ember-cli-babel ^7.17.0, but you have ${versionString} installed; ` +
'your TypeScript files may not be transpiled correctly.'
);
}
Expand Down
Loading