diff --git a/blueprints/acceptance-test/index.js b/blueprints/acceptance-test/index.js
index 2a305ae25d0..7f69750b009 100644
--- a/blueprints/acceptance-test/index.js
+++ b/blueprints/acceptance-test/index.js
@@ -17,10 +17,6 @@ module.exports = useTestFrameworkDetector({
       testFolderRoot = pathUtil.getRelativeParentPath(options.entity.name, -1, false);
     }
 
-    let destroyAppExists = fs.existsSync(
-      path.join(this.project.root, '/tests/helpers/destroy-app.js')
-    );
-
     let friendlyTestName = [
       'Acceptance',
       stringUtils.dasherize(options.entity.name).replace(/[-]/g, ' '),
@@ -29,7 +25,6 @@ module.exports = useTestFrameworkDetector({
     return {
       testFolderRoot: testFolderRoot,
       friendlyTestName,
-      destroyAppExists,
     };
   },
 });
diff --git a/blueprints/acceptance-test/mocha-files/tests/acceptance/__name__-test.js b/blueprints/acceptance-test/mocha-files/tests/acceptance/__name__-test.js
index 2700039e658..9b04b8ec6e8 100644
--- a/blueprints/acceptance-test/mocha-files/tests/acceptance/__name__-test.js
+++ b/blueprints/acceptance-test/mocha-files/tests/acceptance/__name__-test.js
@@ -1,7 +1,7 @@
 import { describe, it, beforeEach, afterEach } from 'mocha';
 import { expect } from 'chai';
 import startApp from '<%= dasherizedPackageName %>/tests/helpers/start-app';
-<% if (destroyAppExists) { %>import destroyApp from '<%= dasherizedPackageName %>/tests/helpers/destroy-app';<% } else { %>import { run } from '@ember/runloop';<% } %>
+import { run } from '@ember/runloop';
 
 describe('<%= friendlyTestName %>', function() {
   let application;
@@ -11,7 +11,7 @@ describe('<%= friendlyTestName %>', function() {
   });
 
   afterEach(function() {
-    <% if (destroyAppExists) { %>destroyApp(application);<% } else { %>run(application, 'destroy');<% } %>
+    run(application, 'destroy');
   });
 
   it('can visit /<%= dasherizedModuleName %>', function() {
diff --git a/blueprints/initializer-test/index.js b/blueprints/initializer-test/index.js
index d12730ad441..2e59f83f724 100644
--- a/blueprints/initializer-test/index.js
+++ b/blueprints/initializer-test/index.js
@@ -12,9 +12,6 @@ module.exports = useTestFrameworkDetector({
     return {
       friendlyTestName: ['Unit', 'Initializer', options.entity.name].join(' | '),
       dasherizedModulePrefix: stringUtils.dasherize(options.project.config().modulePrefix),
-      destroyAppExists: fs.existsSync(
-        path.join(this.project.root, '/tests/helpers/destroy-app.js')
-      ),
     };
   },
 });
diff --git a/blueprints/initializer-test/mocha-files/tests/unit/initializers/__name__-test.js b/blueprints/initializer-test/mocha-files/tests/unit/initializers/__name__-test.js
index 5cad7fb4658..41d59ca4be9 100644
--- a/blueprints/initializer-test/mocha-files/tests/unit/initializers/__name__-test.js
+++ b/blueprints/initializer-test/mocha-files/tests/unit/initializers/__name__-test.js
@@ -3,7 +3,6 @@ import { describe, it, beforeEach, afterEach } from 'mocha';
 import { run } from '@ember/runloop';
 import Application from '@ember/application';
 import { initialize } from '<%= dasherizedModulePrefix %>/initializers/<%= dasherizedModuleName %>';
-import destroyApp from '../../helpers/destroy-app';
 
 describe('<%= friendlyTestName %>', function() {
   let application;
@@ -16,7 +15,7 @@ describe('<%= friendlyTestName %>', function() {
   });
 
   afterEach(function() {
-    destroyApp(application);
+    run(application, 'destroy');
   });
 
   // Replace this with your real tests.
diff --git a/blueprints/initializer-test/qunit-files/tests/unit/initializers/__name__-test.js b/blueprints/initializer-test/qunit-files/tests/unit/initializers/__name__-test.js
index 38630689960..70610cca825 100644
--- a/blueprints/initializer-test/qunit-files/tests/unit/initializers/__name__-test.js
+++ b/blueprints/initializer-test/qunit-files/tests/unit/initializers/__name__-test.js
@@ -1,9 +1,8 @@
 import Application from '@ember/application';
-import { run } from '@ember/runloop';
 
 import { initialize } from '<%= dasherizedModulePrefix %>/initializers/<%= dasherizedModuleName %>';
 import { module, test } from 'qunit';
-<% if (destroyAppExists) { %>import destroyApp from '../../helpers/destroy-app';<% } else { %>import { run } from '@ember/runloop'; <% } %>
+import { run } from '@ember/runloop';
 
 module('<%= friendlyTestName %>', {
   beforeEach() {
@@ -13,7 +12,7 @@ module('<%= friendlyTestName %>', {
     });
   },
   afterEach() {
-    <% if (destroyAppExists) { %>destroyApp(this.application);<% } else { %>run(this.application, 'destroy');<% } %>
+    run(this.application, 'destroy');
   }
 });
 
diff --git a/blueprints/initializer-test/qunit-rfc-232-files/tests/unit/initializers/__name__-test.js b/blueprints/initializer-test/qunit-rfc-232-files/tests/unit/initializers/__name__-test.js
index 40609d2c3cd..904c5e6b6a1 100644
--- a/blueprints/initializer-test/qunit-rfc-232-files/tests/unit/initializers/__name__-test.js
+++ b/blueprints/initializer-test/qunit-rfc-232-files/tests/unit/initializers/__name__-test.js
@@ -3,7 +3,7 @@ import Application from '@ember/application';
 import { initialize } from '<%= dasherizedModulePrefix %>/initializers/<%= dasherizedModuleName %>';
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
-<% if (destroyAppExists) { %>import destroyApp from '../../helpers/destroy-app';<% } else { %>import { run } from '@ember/runloop';<% } %>
+import { run } from '@ember/runloop';
 
 module('<%= friendlyTestName %>', function(hooks) {
   setupTest(hooks);
@@ -19,7 +19,7 @@ module('<%= friendlyTestName %>', function(hooks) {
   });
 
   hooks.afterEach(function() {
-    <% if (destroyAppExists) { %>destroyApp(this.application);<% } else { %>run(this.application, 'destroy');<% } %>
+    run(this.application, 'destroy');
   });
 
   // Replace this with your real tests.
diff --git a/blueprints/instance-initializer-test/index.js b/blueprints/instance-initializer-test/index.js
index 9b5282c7b85..a3d210f4276 100644
--- a/blueprints/instance-initializer-test/index.js
+++ b/blueprints/instance-initializer-test/index.js
@@ -12,9 +12,6 @@ module.exports = useTestFrameworkDetector({
     return {
       friendlyTestName: ['Unit', 'Instance Initializer', options.entity.name].join(' | '),
       dasherizedModulePrefix: stringUtils.dasherize(options.project.config().modulePrefix),
-      destroyAppExists: fs.existsSync(
-        path.join(this.project.root, '/tests/helpers/destroy-app.js')
-      ),
     };
   },
 });
diff --git a/blueprints/instance-initializer-test/mocha-files/tests/unit/instance-initializers/__name__-test.js b/blueprints/instance-initializer-test/mocha-files/tests/unit/instance-initializers/__name__-test.js
index 4c33d9ca485..2f7909fa692 100644
--- a/blueprints/instance-initializer-test/mocha-files/tests/unit/instance-initializers/__name__-test.js
+++ b/blueprints/instance-initializer-test/mocha-files/tests/unit/instance-initializers/__name__-test.js
@@ -3,7 +3,6 @@ import { describe, it, beforeEach } from 'mocha';
 import Application from '@ember/application';
 import { run } from '@ember/runloop';
 import { initialize } from '<%= dasherizedModulePrefix %>/instance-initializers/<%= dasherizedModuleName %>';
-import destroyApp from '../../helpers/destroy-app';
 
 describe('<%= friendlyTestName %>', function() {
   let application, appInstance;
@@ -17,7 +16,7 @@ describe('<%= friendlyTestName %>', function() {
 
   afterEach(function() {
     run(appInstance, 'destroy');
-    destroyApp(application);
+    run(application, 'destroy');
   });
 
   // Replace this with your real tests.
diff --git a/blueprints/instance-initializer-test/qunit-files/tests/unit/instance-initializers/__name__-test.js b/blueprints/instance-initializer-test/qunit-files/tests/unit/instance-initializers/__name__-test.js
index 7c9825b7ee2..89704715a2e 100644
--- a/blueprints/instance-initializer-test/qunit-files/tests/unit/instance-initializers/__name__-test.js
+++ b/blueprints/instance-initializer-test/qunit-files/tests/unit/instance-initializers/__name__-test.js
@@ -1,8 +1,7 @@
 import Application from '@ember/application';
 import { run } from '@ember/runloop';
 import { initialize } from '<%= dasherizedModulePrefix %>/instance-initializers/<%= dasherizedModuleName %>';
-import { module, test } from 'qunit';<% if (destroyAppExists) { %>
-import destroyApp from '../../helpers/destroy-app';<% } %>
+import { module, test } from 'qunit';
 
 module('<%= friendlyTestName %>', {
   beforeEach() {
@@ -13,7 +12,7 @@ module('<%= friendlyTestName %>', {
   },
   afterEach() {
     run(this.appInstance, 'destroy');
-    <% if (destroyAppExists) { %>destroyApp(this.application);<% } else { %>run(this.application, 'destroy');<% } %>
+    run(this.application, 'destroy');
   }
 });
 
diff --git a/blueprints/instance-initializer-test/qunit-rfc-232-files/tests/unit/instance-initializers/__name__-test.js b/blueprints/instance-initializer-test/qunit-rfc-232-files/tests/unit/instance-initializers/__name__-test.js
index 0e67d1414d7..e4e6695e0e4 100644
--- a/blueprints/instance-initializer-test/qunit-rfc-232-files/tests/unit/instance-initializers/__name__-test.js
+++ b/blueprints/instance-initializer-test/qunit-rfc-232-files/tests/unit/instance-initializers/__name__-test.js
@@ -3,7 +3,7 @@ import Application from '@ember/application';
 import { initialize } from '<%= dasherizedModulePrefix %>/instance-initializers/<%= dasherizedModuleName %>';
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
-<% if (destroyAppExists) { %>import destroyApp from '../../helpers/destroy-app';<% } else { %>import { run } from '@ember/runloop';<% } %>
+import { run } from '@ember/runloop';
 
 module('<%= friendlyTestName %>', function(hooks) {
   setupTest(hooks);
@@ -18,8 +18,8 @@ module('<%= friendlyTestName %>', function(hooks) {
     this.instance = this.application.buildInstance();
   });
   hooks.afterEach(function() {
-    <% if (destroyAppExists) { %>destroyApp(this.application);<% } else { %>run(this.application, 'destroy');<% } %>
-    <% if (destroyAppExists) { %>destroyApp(this.instance);<% } else { %>run(this.instance, 'destroy');<% } %>
+    run(this.application, 'destroy');
+    run(this.instance, 'destroy');
   });
 
   // Replace this with your real tests.
diff --git a/node-tests/fixtures/acceptance-test/mocha.js b/node-tests/fixtures/acceptance-test/mocha.js
index b848b07699e..b2a8f0b6171 100644
--- a/node-tests/fixtures/acceptance-test/mocha.js
+++ b/node-tests/fixtures/acceptance-test/mocha.js
@@ -1,7 +1,7 @@
 import { describe, it, beforeEach, afterEach } from 'mocha';
 import { expect } from 'chai';
 import startApp from 'my-app/tests/helpers/start-app';
-import destroyApp from 'my-app/tests/helpers/destroy-app';
+import { run } from '@ember/runloop';
 
 describe('Acceptance | foo', function() {
   let application;
@@ -11,7 +11,7 @@ describe('Acceptance | foo', function() {
   });
 
   afterEach(function() {
-    destroyApp(application);
+    run(application, 'destroy');
   });
 
   it('can visit /foo', function() {
diff --git a/node-tests/fixtures/initializer-test/default.js b/node-tests/fixtures/initializer-test/default.js
index e5b1f28bc08..2b2437239dd 100644
--- a/node-tests/fixtures/initializer-test/default.js
+++ b/node-tests/fixtures/initializer-test/default.js
@@ -1,9 +1,8 @@
 import Application from '@ember/application';
-import { run } from '@ember/runloop';
 
 import { initialize } from 'my-app/initializers/foo';
 import { module, test } from 'qunit';
-import destroyApp from '../../helpers/destroy-app';
+import { run } from '@ember/runloop';
 
 module('Unit | Initializer | foo', {
   beforeEach() {
@@ -13,7 +12,7 @@ module('Unit | Initializer | foo', {
     });
   },
   afterEach() {
-    destroyApp(this.application);
+    run(this.application, 'destroy');
   }
 });
 
diff --git a/node-tests/fixtures/initializer-test/dummy.js b/node-tests/fixtures/initializer-test/dummy.js
index 35bad949824..22608420812 100644
--- a/node-tests/fixtures/initializer-test/dummy.js
+++ b/node-tests/fixtures/initializer-test/dummy.js
@@ -1,9 +1,8 @@
 import Application from '@ember/application';
-import { run } from '@ember/runloop';
 
 import { initialize } from 'dummy/initializers/foo';
 import { module, test } from 'qunit';
-import destroyApp from '../../helpers/destroy-app';
+import { run } from '@ember/runloop';
 
 module('Unit | Initializer | foo', {
   beforeEach() {
@@ -13,7 +12,7 @@ module('Unit | Initializer | foo', {
     });
   },
   afterEach() {
-    destroyApp(this.application);
+    run(this.application, 'destroy');
   }
 });
 
diff --git a/node-tests/fixtures/initializer-test/mocha.js b/node-tests/fixtures/initializer-test/mocha.js
index c8a0f261bcc..5e1cf27c7fe 100644
--- a/node-tests/fixtures/initializer-test/mocha.js
+++ b/node-tests/fixtures/initializer-test/mocha.js
@@ -3,7 +3,6 @@ import { describe, it, beforeEach, afterEach } from 'mocha';
 import { run } from '@ember/runloop';
 import Application from '@ember/application';
 import { initialize } from 'my-app/initializers/foo';
-import destroyApp from '../../helpers/destroy-app';
 
 describe('Unit | Initializer | foo', function() {
   let application;
@@ -16,7 +15,7 @@ describe('Unit | Initializer | foo', function() {
   });
 
   afterEach(function() {
-    destroyApp(application);
+    run(application, 'destroy');
   });
 
   // Replace this with your real tests.
diff --git a/node-tests/fixtures/initializer-test/rfc232.js b/node-tests/fixtures/initializer-test/rfc232.js
index 7586f355d13..9a45208e1ab 100644
--- a/node-tests/fixtures/initializer-test/rfc232.js
+++ b/node-tests/fixtures/initializer-test/rfc232.js
@@ -3,7 +3,7 @@ import Application from '@ember/application';
 import { initialize } from 'my-app/initializers/foo';
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
-import destroyApp from '../../helpers/destroy-app';
+import { run } from '@ember/runloop';
 
 module('Unit | Initializer | foo', function(hooks) {
   setupTest(hooks);
@@ -19,7 +19,7 @@ module('Unit | Initializer | foo', function(hooks) {
   });
 
   hooks.afterEach(function() {
-    destroyApp(this.application);
+    run(this.application, 'destroy');
   });
 
   // Replace this with your real tests.
diff --git a/node-tests/fixtures/instance-initializer-test/default.js b/node-tests/fixtures/instance-initializer-test/default.js
index 680067e0667..52de0c7c8be 100644
--- a/node-tests/fixtures/instance-initializer-test/default.js
+++ b/node-tests/fixtures/instance-initializer-test/default.js
@@ -2,7 +2,6 @@ import Application from '@ember/application';
 import { run } from '@ember/runloop';
 import { initialize } from 'my-app/instance-initializers/foo';
 import { module, test } from 'qunit';
-import destroyApp from '../../helpers/destroy-app';
 
 module('Unit | Instance Initializer | foo', {
   beforeEach() {
@@ -13,7 +12,7 @@ module('Unit | Instance Initializer | foo', {
   },
   afterEach() {
     run(this.appInstance, 'destroy');
-    destroyApp(this.application);
+    run(this.application, 'destroy');
   }
 });
 
diff --git a/node-tests/fixtures/instance-initializer-test/dummy.js b/node-tests/fixtures/instance-initializer-test/dummy.js
index ff4cc535f3a..9b5fba7bda8 100644
--- a/node-tests/fixtures/instance-initializer-test/dummy.js
+++ b/node-tests/fixtures/instance-initializer-test/dummy.js
@@ -2,7 +2,6 @@ import Application from '@ember/application';
 import { run } from '@ember/runloop';
 import { initialize } from 'dummy/instance-initializers/foo';
 import { module, test } from 'qunit';
-import destroyApp from '../../helpers/destroy-app';
 
 module('Unit | Instance Initializer | foo', {
   beforeEach() {
@@ -13,7 +12,7 @@ module('Unit | Instance Initializer | foo', {
   },
   afterEach() {
     run(this.appInstance, 'destroy');
-    destroyApp(this.application);
+    run(this.application, 'destroy');
   }
 });
 
diff --git a/node-tests/fixtures/instance-initializer-test/mocha.js b/node-tests/fixtures/instance-initializer-test/mocha.js
index 1526ec52a36..8b7c60f6f8b 100644
--- a/node-tests/fixtures/instance-initializer-test/mocha.js
+++ b/node-tests/fixtures/instance-initializer-test/mocha.js
@@ -3,7 +3,6 @@ import { describe, it, beforeEach } from 'mocha';
 import Application from '@ember/application';
 import { run } from '@ember/runloop';
 import { initialize } from 'my-app/instance-initializers/foo';
-import destroyApp from '../../helpers/destroy-app';
 
 describe('Unit | Instance Initializer | foo', function() {
   let application, appInstance;
@@ -17,7 +16,7 @@ describe('Unit | Instance Initializer | foo', function() {
 
   afterEach(function() {
     run(appInstance, 'destroy');
-    destroyApp(application);
+    run(application, 'destroy');
   });
 
   // Replace this with your real tests.
diff --git a/node-tests/fixtures/instance-initializer-test/rfc232.js b/node-tests/fixtures/instance-initializer-test/rfc232.js
index d3378f08aef..0d0522b0618 100644
--- a/node-tests/fixtures/instance-initializer-test/rfc232.js
+++ b/node-tests/fixtures/instance-initializer-test/rfc232.js
@@ -3,7 +3,7 @@ import Application from '@ember/application';
 import { initialize } from 'my-app/instance-initializers/foo';
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
-import destroyApp from '../../helpers/destroy-app';
+import { run } from '@ember/runloop';
 
 module('Unit | Instance Initializer | foo', function(hooks) {
   setupTest(hooks);
@@ -18,8 +18,8 @@ module('Unit | Instance Initializer | foo', function(hooks) {
     this.instance = this.application.buildInstance();
   });
   hooks.afterEach(function() {
-    destroyApp(this.application);
-    destroyApp(this.instance);
+    run(this.application, 'destroy');
+    run(this.instance, 'destroy');
   });
 
   // Replace this with your real tests.
diff --git a/package.json b/package.json
index 1cc15ddac1d..89f3637618d 100644
--- a/package.json
+++ b/package.json
@@ -107,7 +107,7 @@
     "broccoli-uglify-sourcemap": "^2.0.2",
     "common-tags": "^1.7.2",
     "dag-map": "^2.0.2",
-    "ember-cli": "github:ember-cli/ember-cli#76175513c5e49caf5405b7304e83ddf3e799c68e",
+    "ember-cli": "github:ember-cli/ember-cli#ec12c757fab32d4207f35e4ddd048a4cfba2289a",
     "ember-cli-blueprint-test-helpers": "^0.18.3",
     "ember-cli-browserstack": "^0.0.6",
     "ember-cli-dependency-checker": "^2.1.0",
diff --git a/yarn.lock b/yarn.lock
index a10f50cce9d..eeb585e1884 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -259,6 +259,12 @@ ansi-styles@^3.0.0, ansi-styles@^3.1.0:
   dependencies:
     color-convert "^1.9.0"
 
+ansi-styles@^3.2.1:
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d"
+  dependencies:
+    color-convert "^1.9.0"
+
 ansicolors@~0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/ansicolors/-/ansicolors-0.2.1.tgz#be089599097b74a5c9c4a84a0cdbcdb62bd87aef"
@@ -1383,11 +1389,11 @@ broccoli-merge-trees@^2.0.0:
     merge-trees "^1.0.1"
 
 broccoli-middleware@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/broccoli-middleware/-/broccoli-middleware-1.0.0.tgz#92f4e1fb9a791ea986245a7077f35cc648dab097"
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/broccoli-middleware/-/broccoli-middleware-1.2.1.tgz#a21f255f8bfe5a21c2f0fbf2417addd9d24c9436"
   dependencies:
     handlebars "^4.0.4"
-    mime "^1.2.11"
+    mime-types "^2.1.18"
 
 broccoli-persistent-filter@^1.1.5, broccoli-persistent-filter@^1.1.6, broccoli-persistent-filter@^1.4.0, broccoli-persistent-filter@^1.4.3:
   version "1.4.3"
@@ -1747,6 +1753,14 @@ chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.3.0:
     escape-string-regexp "^1.0.5"
     supports-color "^4.0.0"
 
+chalk@^2.3.1:
+  version "2.3.2"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.3.2.tgz#250dc96b07491bfd601e648d66ddf5f60c7a5c65"
+  dependencies:
+    ansi-styles "^3.2.1"
+    escape-string-regexp "^1.0.5"
+    supports-color "^5.3.0"
+
 chardet@^0.4.0:
   version "0.4.2"
   resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.4.2.tgz#b5473b33dc97c424e5d98dc87d55d4d8a29c8bf2"
@@ -1828,9 +1842,9 @@ cli-cursor@^2.1.0:
   dependencies:
     restore-cursor "^2.0.0"
 
-cli-spinners@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-1.1.0.tgz#f1847b168844d917a671eb9d147e3df497c90d06"
+cli-spinners@^1.1.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-1.3.0.tgz#6ba8b357395f07b7981c1acc2614485ee8c02a2d"
 
 cli-table2@^0.2.0:
   version "0.2.0"
@@ -1867,6 +1881,10 @@ cliui@^4.0.0:
     strip-ansi "^4.0.0"
     wrap-ansi "^2.0.0"
 
+clone@^1.0.2:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.4.tgz#da309cc263df15994c688ca902179ca3c7cd7c7e"
+
 clone@^2.0.0:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/clone/-/clone-2.1.1.tgz#d217d1e961118e3ac9a4b8bba3285553bf647cdb"
@@ -1907,8 +1925,8 @@ colors@1.0.3:
   resolved "https://registry.yarnpkg.com/colors/-/colors-1.0.3.tgz#0433f44d809680fdeb60ed260f1b0c262e82a40b"
 
 colors@^1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/colors/-/colors-1.1.2.tgz#168a4701756b6a7f51a12ce0c97bfa28c084ed63"
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/colors/-/colors-1.2.1.tgz#f4a3d302976aaf042356ba1ade3b1a2c62d9d794"
 
 combined-stream@^1.0.5, combined-stream@~1.0.5:
   version "1.0.5"
@@ -2017,13 +2035,13 @@ console-control-strings@^1.0.0, console-control-strings@~1.1.0:
   resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e"
 
 console-ui@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/console-ui/-/console-ui-2.1.0.tgz#e1d5279d27621a75123d7d594f9fa59f866ea3e3"
+  version "2.2.2"
+  resolved "https://registry.yarnpkg.com/console-ui/-/console-ui-2.2.2.tgz#b294a2934de869dd06789ab4be69555411edef29"
   dependencies:
     chalk "^2.1.0"
     inquirer "^2"
     json-stable-stringify "^1.0.1"
-    ora "^1.3.0"
+    ora "^2.0.0"
     through "^2.3.8"
     user-info "^1.0.0"
 
@@ -2223,6 +2241,12 @@ deep-is@~0.1.3:
   version "0.1.3"
   resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34"
 
+defaults@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/defaults/-/defaults-1.0.3.tgz#c656051e9817d9ff08ed881477f3fe4019f3ef7d"
+  dependencies:
+    clone "^1.0.2"
+
 define-property@^0.2.5:
   version "0.2.5"
   resolved "https://registry.yarnpkg.com/define-property/-/define-property-0.2.5.tgz#c35b1ef918ec3c990f9a5bc57be04aacec5c8116"
@@ -2514,9 +2538,9 @@ ember-cli-yuidoc@^0.8.8:
     rsvp "3.0.14"
     yuidocjs "^0.10.0"
 
-"ember-cli@github:ember-cli/ember-cli#76175513c5e49caf5405b7304e83ddf3e799c68e":
+"ember-cli@github:ember-cli/ember-cli#ec12c757fab32d4207f35e4ddd048a4cfba2289a":
   version "3.0.0-beta.1"
-  resolved "https://codeload.github.com/ember-cli/ember-cli/tar.gz/76175513c5e49caf5405b7304e83ddf3e799c68e"
+  resolved "https://codeload.github.com/ember-cli/ember-cli/tar.gz/ec12c757fab32d4207f35e4ddd048a4cfba2289a"
   dependencies:
     amd-name-resolver "1.0.0"
     babel-plugin-transform-es2015-modules-amd "^6.24.0"
@@ -3722,6 +3746,10 @@ has-flag@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-2.0.0.tgz#e8207af1cc7b30d446cc70b734b5e8be18f88d51"
 
+has-flag@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
+
 has-unicode@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9"
@@ -4842,11 +4870,11 @@ lodash@^4.6.1:
   version "4.17.5"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.5.tgz#99a92d65c0272debe8c96b6057bc8fbfa3bed511"
 
-log-symbols@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-1.0.2.tgz#376ff7b58ea3086a0f09facc74617eca501e1a18"
+log-symbols@^2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-2.2.0.tgz#5740e1c5d6f0dfda4ad9323b5332107ef6b4c40a"
   dependencies:
-    chalk "^1.0.0"
+    chalk "^2.0.1"
 
 lolex@1.3.2:
   version "1.3.2"
@@ -5068,12 +5096,22 @@ mime-db@~1.30.0:
   version "1.30.0"
   resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.30.0.tgz#74c643da2dd9d6a45399963465b26d5ca7d71f01"
 
+mime-db@~1.33.0:
+  version "1.33.0"
+  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.33.0.tgz#a3492050a5cb9b63450541e39d9788d2272783db"
+
 mime-types@^2.1.12, mime-types@~2.1.11, mime-types@~2.1.15, mime-types@~2.1.16, mime-types@~2.1.7:
   version "2.1.17"
   resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.17.tgz#09d7a393f03e995a79f8af857b70a9e0ab16557a"
   dependencies:
     mime-db "~1.30.0"
 
+mime-types@^2.1.18:
+  version "2.1.18"
+  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.18.tgz#6f323f60a83d11146f831ff11fd66e2fe5503bb8"
+  dependencies:
+    mime-db "~1.33.0"
+
 mime-types@~1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-1.0.2.tgz#995ae1392ab8affcbfcb2641dd054e943c0d5dce"
@@ -5430,14 +5468,16 @@ options@>=0.0.5:
   version "0.0.6"
   resolved "https://registry.yarnpkg.com/options/-/options-0.0.6.tgz#ec22d312806bb53e731773e7cdaefcf1c643128f"
 
-ora@^1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/ora/-/ora-1.3.0.tgz#80078dd2b92a934af66a3ad72a5b910694ede51a"
+ora@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/ora/-/ora-2.0.0.tgz#8ec3a37fa7bffb54a3a0c188a1f6798e7e1827cd"
   dependencies:
-    chalk "^1.1.1"
+    chalk "^2.3.1"
     cli-cursor "^2.1.0"
-    cli-spinners "^1.0.0"
-    log-symbols "^1.0.2"
+    cli-spinners "^1.1.0"
+    log-symbols "^2.2.0"
+    strip-ansi "^4.0.0"
+    wcwidth "^1.0.1"
 
 os-homedir@^1.0.0, os-homedir@^1.0.1:
   version "1.0.2"
@@ -6736,6 +6776,12 @@ supports-color@^4.0.0:
   dependencies:
     has-flag "^2.0.0"
 
+supports-color@^5.3.0:
+  version "5.3.0"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.3.0.tgz#5b24ac15db80fa927cf5227a4a33fd3c4c7676c0"
+  dependencies:
+    has-flag "^3.0.0"
+
 symlink-or-copy@^1.0.0:
   version "1.1.8"
   resolved "https://registry.yarnpkg.com/symlink-or-copy/-/symlink-or-copy-1.1.8.tgz#cabe61e0010c1c023c173b25ee5108b37f4b4aa3"
@@ -7283,6 +7329,12 @@ watch@~0.18.0:
     exec-sh "^0.2.0"
     minimist "^1.2.0"
 
+wcwidth@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/wcwidth/-/wcwidth-1.0.1.tgz#f0b0dcf915bc5ff1528afadb2c0e17b532da2fe8"
+  dependencies:
+    defaults "^1.0.3"
+
 websocket-driver@>=0.5.1:
   version "0.7.0"
   resolved "https://registry.yarnpkg.com/websocket-driver/-/websocket-driver-0.7.0.tgz#0caf9d2d755d93aee049d4bdd0d3fe2cca2a24eb"