Merge pull request ember-cli#7548 from rwjblue/nicer-async-await

Make async/await work nicely by default.
rwjblue · Jan 11, 2018 · f810b5d · f810b5d
2 parents 7a86445 + 7798114
commit f810b5d
Show file tree

Hide file tree

Showing 9 changed files with 22 additions and 6 deletions.
diff --git a/blueprints/app/files/config/targets.js b/blueprints/app/files/config/targets.js
@@ -1,8 +1,16 @@
+const browsers = [
+  'last 1 Chrome versions',
+  'last 1 Firefox versions',
+  'last 1 Safari versions'
+];
+
+const isCI = !!process.env.CI;
+const isProduction = process.env.EMBER_ENV === 'production';
+
+if (isCI || isProduction) {
+  browsers.push('ie 11');
+}
+
 module.exports = {
-  browsers: [
-    'ie 9',
-    'last 1 Chrome versions',
-    'last 1 Firefox versions',
-    'last 1 Safari versions'
-  ]
+  browsers
 };
diff --git a/blueprints/app/files/package.json b/blueprints/app/files/package.json
@@ -34,6 +34,7 @@
     "ember-data": "~3.0.0-beta.1",
     "ember-export-application-global": "^2.0.0",
     "ember-load-initializers": "^1.0.0",
+    "ember-maybe-import-regenerator": "^0.1.6",
     "ember-resolver": "^4.0.0",
     "ember-source": "~3.0.0-beta.1<% if (welcome) { %>",
     "ember-welcome-page": "^3.0.0<% } %>",

diff --git a/blueprints/module-unification-app/files/package.json b/blueprints/module-unification-app/files/package.json
@@ -34,6 +34,7 @@
     "ember-data": "~2.18.0-beta.1",
     "ember-export-application-global": "^2.0.0",
     "ember-load-initializers": "^1.0.0",
+    "ember-maybe-import-regenerator": "^0.1.6",
     "ember-resolver": "^4.0.0<% if (welcome) { %>",
     "ember-welcome-page": "^3.0.0<% } %>",
     "eslint-plugin-ember": "^5.0.0",

diff --git a/tests/fixtures/addon/npm/package.json b/tests/fixtures/addon/npm/package.json
@@ -37,6 +37,7 @@
     "ember-disable-prototype-extensions": "^1.1.2",
     "ember-export-application-global": "^2.0.0",
     "ember-load-initializers": "^1.0.0",
+    "ember-maybe-import-regenerator": "^0.1.6",
     "ember-resolver": "^4.0.0",
     "ember-source": "~3.0.0-beta.1",
     "eslint-plugin-ember": "^5.0.0",

diff --git a/tests/fixtures/addon/yarn/package.json b/tests/fixtures/addon/yarn/package.json
@@ -37,6 +37,7 @@
     "ember-disable-prototype-extensions": "^1.1.2",
     "ember-export-application-global": "^2.0.0",
     "ember-load-initializers": "^1.0.0",
+    "ember-maybe-import-regenerator": "^0.1.6",
     "ember-resolver": "^4.0.0",
     "ember-source": "~3.0.0-beta.1",
     "ember-welcome-page": "^3.0.0",

diff --git a/tests/fixtures/app/npm/package.json b/tests/fixtures/app/npm/package.json
@@ -34,6 +34,7 @@
     "ember-data": "~3.0.0-beta.1",
     "ember-export-application-global": "^2.0.0",
     "ember-load-initializers": "^1.0.0",
+    "ember-maybe-import-regenerator": "^0.1.6",
     "ember-resolver": "^4.0.0",
     "ember-source": "~3.0.0-beta.1",
     "eslint-plugin-ember": "^5.0.0",

diff --git a/tests/fixtures/app/yarn/package.json b/tests/fixtures/app/yarn/package.json
@@ -34,6 +34,7 @@
     "ember-data": "~3.0.0-beta.1",
     "ember-export-application-global": "^2.0.0",
     "ember-load-initializers": "^1.0.0",
+    "ember-maybe-import-regenerator": "^0.1.6",
     "ember-resolver": "^4.0.0",
     "ember-source": "~3.0.0-beta.1",
     "ember-welcome-page": "^3.0.0",

diff --git a/tests/fixtures/module-unification-app/npm/package.json b/tests/fixtures/module-unification-app/npm/package.json
@@ -34,6 +34,7 @@
     "ember-data": "~2.18.0-beta.1",
     "ember-export-application-global": "^2.0.0",
     "ember-load-initializers": "^1.0.0",
+    "ember-maybe-import-regenerator": "^0.1.6",
     "ember-resolver": "^4.0.0",
     "eslint-plugin-ember": "^5.0.0",
     "loader.js": "^4.2.3"

diff --git a/tests/fixtures/module-unification-app/yarn/package.json b/tests/fixtures/module-unification-app/yarn/package.json
@@ -34,6 +34,7 @@
     "ember-data": "~2.18.0-beta.1",
     "ember-export-application-global": "^2.0.0",
     "ember-load-initializers": "^1.0.0",
+    "ember-maybe-import-regenerator": "^0.1.6",
     "ember-resolver": "^4.0.0",
     "ember-welcome-page": "^3.0.0",
     "eslint-plugin-ember": "^5.0.0",