From 6d4ca852daf1aa3cff2c7bc97de8816f2047c4a2 Mon Sep 17 00:00:00 2001
From: Robert Jackson <rjackson@linkedin.com>
Date: Tue, 26 Jun 2018 17:56:46 -0400
Subject: [PATCH] [BUGFIX beta] Ensure tests from @ember/* are excluded from
 debug/prod builds.

---
 ember-cli-build.js | 24 ++++++++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

diff --git a/ember-cli-build.js b/ember-cli-build.js
index 47b390e557d..4d88f5c9ab2 100644
--- a/ember-cli-build.js
+++ b/ember-cli-build.js
@@ -118,7 +118,12 @@ module.exports = function() {
   // Bundling
   let emberTestsBundle = new MergeTrees([
     new Funnel(packagesES5, {
-      include: ['internal-test-helpers/**', '*/tests/**', 'license.js'],
+      include: [
+        'internal-test-helpers/**',
+        '*/*/tests/**' /* scoped packages */,
+        '*/tests/**' /* packages */,
+        'license.js',
+      ],
     }),
     loader,
     license,
@@ -133,7 +138,12 @@ module.exports = function() {
 
   let emberDebugBundle = new MergeTrees([
     new Funnel(packagesES5, {
-      exclude: ['*/tests/**', 'ember-template-compiler/**', 'internal-test-helpers/**'],
+      exclude: [
+        '*/*/tests/**' /* scoped packages */,
+        '*/tests/**' /* packages */,
+        'ember-template-compiler/**',
+        'internal-test-helpers/**',
+      ],
     }),
     dependenciesES5,
     loader,
@@ -208,7 +218,8 @@ module.exports = function() {
     let emberProdBundle = new MergeTrees([
       new Funnel(prodPackagesES5, {
         exclude: [
-          '*/tests/**',
+          '*/*/tests/**' /* scoped packages */,
+          '*/tests/**' /* packages */,
           'ember-template-compiler/**',
           'ember-testing/**',
           'internal-test-helpers/**',
@@ -235,7 +246,12 @@ module.exports = function() {
 
     let emberTestsBundle = new MergeTrees([
       new Funnel(prodPackagesES5, {
-        include: ['internal-test-helpers/**', '*/tests/**', 'license.js'],
+        include: [
+          'internal-test-helpers/**',
+          '*/*/tests/**' /* scoped packages */,
+          '*/tests/**' /* packages */,
+          'license.js',
+        ],
       }),
       loader,
       license,