Merge pull request #1074 from typed-ember/new-minimum-babel-version

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

Author: dfreeman

package.json

@@ -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",

ts/addon.ts

@@ -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.'
       );
     }

ts/blueprints/ember-cli-typescript/index.js

@@ -68,10 +68,11 @@ module.exports = {
     }
 
     return {
-      includes: JSON.stringify(includes.map(include => `${include}/**/*`), null, 2).replace(
-        /\n/g,
-        '\n  '
-      ),
+      includes: JSON.stringify(
+        includes.map(include => `${include}/**/*`),
+        null,
+        2
+      ).replace(/\n/g, '\n  '),
       pathsFor: dasherizedName => {
         // We need to wait to use this module until `ember-cli-typescript-blueprints` has been installed
         let updatePathsForAddon = require('ember-cli-typescript-blueprints/lib/utilities/update-paths-for-addon');