From babcbf4a36d281f770d85d95e46cdf5eb6366958 Mon Sep 17 00:00:00 2001
From: Ben Demboski <demboskb@gmail.com>
Date: Wed, 28 Apr 2021 22:20:16 -0700
Subject: [PATCH] Fix embroider scenarios

See https://github.com/embroider-build/embroider/issues/799 and https://github.com/embroider-build/embroider/pull/792
---
 config/ember-try.js           | 26 ++++++++++++++++++++++++--
 tests/dummy/config/targets.js |  7 -------
 2 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/config/ember-try.js b/config/ember-try.js
index 72f0ea6..793af65 100644
--- a/config/ember-try.js
+++ b/config/ember-try.js
@@ -75,8 +75,30 @@ module.exports = async function () {
           },
         },
       },
-      embroiderSafe(),
-      embroiderOptimized(),
+      embroiderSafe({
+        // https://github.com/embroider-build/embroider/issues/799
+        env: {
+          JOBS: '1',
+        },
+        // https://github.com/embroider-build/embroider/pull/792
+        npm: {
+          devDependencies: {
+            webpack: '^5.0.0',
+          },
+        },
+      }),
+      embroiderOptimized({
+        // https://github.com/embroider-build/embroider/issues/799
+        env: {
+          JOBS: '1',
+        },
+        // https://github.com/embroider-build/embroider/pull/792
+        npm: {
+          devDependencies: {
+            webpack: '^5.0.0',
+          },
+        },
+      }),
     ],
   };
 };
diff --git a/tests/dummy/config/targets.js b/tests/dummy/config/targets.js
index 4b33327..1e48e05 100644
--- a/tests/dummy/config/targets.js
+++ b/tests/dummy/config/targets.js
@@ -6,13 +6,6 @@ const browsers = [
   'last 1 Safari versions',
 ];
 
-const isCI = Boolean(process.env.CI);
-const isProduction = process.env.EMBER_ENV === 'production';
-
-if (isCI || isProduction) {
-  browsers.push('ie 11');
-}
-
 module.exports = {
   browsers,
 };