From 51660ffb2529583ffbc00ff758b82090e2c7f53c Mon Sep 17 00:00:00 2001
From: John Cowen <johncowen@users.noreply.github.com>
Date: Fri, 12 Jun 2020 13:06:59 +0100
Subject: [PATCH] ui: Exclude any component/pageobject.js files from being
 included (#7978)

This excludes any /components/**/pageobject.js files from our production
builds which means we can co-locate all of our component page objects
(and selectors) along with the components themselves.
---
 ui-v2/ember-cli-build.js | 26 ++++++++++++++++++--------
 ui-v2/package.json       |  1 +
 ui-v2/yarn.lock          | 16 ++++++++++++++++
 3 files changed, 35 insertions(+), 8 deletions(-)

diff --git a/ui-v2/ember-cli-build.js b/ui-v2/ember-cli-build.js
index 8d446bb506..b9604563ed 100644
--- a/ui-v2/ember-cli-build.js
+++ b/ui-v2/ember-cli-build.js
@@ -1,28 +1,38 @@
 'use strict';
-
+const Funnel = require('broccoli-funnel');
 const EmberApp = require('ember-cli/lib/broccoli/ember-app');
 module.exports = function(defaults) {
   const env = EmberApp.env();
   const prodlike = ['production', 'staging'];
   const isProd = env === 'production';
-  // if we ever need a 'prodlike' staging environment with staging settings
-  // const isProdLike = prodlike.indexOf(env) > -1;
+  const isProdLike = prodlike.indexOf(env) > -1;
   const sourcemaps = !isProd;
+  let trees = {};
+  if(isProdLike) {
+    // exclude any component/pageobject.js files from production-like environments
+    trees.app = new Funnel(
+      'app',
+      {
+        exclude: ['components/**/pageobject.js']
+      }
+    );
+  }
   let app = new EmberApp(
     Object.assign({}, defaults, {
       productionEnvironments: prodlike,
     }),
     {
+      trees: trees,
       'ember-cli-babel': {
         includePolyfill: true,
       },
       'ember-cli-string-helpers': {
         only: [
-          'capitalize', 
-          'lowercase', 
-          'truncate', 
-          'uppercase', 
-          'humanize', 
+          'capitalize',
+          'lowercase',
+          'truncate',
+          'uppercase',
+          'humanize',
           'titleize'
         ],
       },
diff --git a/ui-v2/package.json b/ui-v2/package.json
index bed1824583..a5eb9ccec4 100644
--- a/ui-v2/package.json
+++ b/ui-v2/package.json
@@ -62,6 +62,7 @@
     "babel-eslint": "^10.0.3",
     "base64-js": "^1.3.0",
     "broccoli-asset-rev": "^3.0.0",
+    "broccoli-funnel": "^3.0.3",
     "chalk": "^2.4.2",
     "clipboard": "^2.0.4",
     "css.escape": "^1.5.1",
diff --git a/ui-v2/yarn.lock b/ui-v2/yarn.lock
index 7bee2064ab..0f4a4f0411 100644
--- a/ui-v2/yarn.lock
+++ b/ui-v2/yarn.lock
@@ -3179,6 +3179,22 @@ broccoli-funnel@^3.0.1:
     path-posix "^1.0.0"
     walk-sync "^2.0.2"
 
+broccoli-funnel@^3.0.3:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/broccoli-funnel/-/broccoli-funnel-3.0.3.tgz#26fd42632471f67a91f4770d1987118087219937"
+  integrity sha512-LPzZ91BwStoHZXdXHQAJeYORl189OrRKM5NdIi86SDU9wZ4s/3lV1PRFOiobDT/jKM10voM7CDzfvicHbCYxAQ==
+  dependencies:
+    array-equal "^1.0.0"
+    blank-object "^1.0.1"
+    broccoli-plugin "^4.0.1"
+    debug "^4.1.1"
+    fast-ordered-set "^1.0.0"
+    fs-tree-diff "^2.0.1"
+    heimdalljs "^0.2.0"
+    minimatch "^3.0.0"
+    path-posix "^1.0.0"
+    walk-sync "^2.0.2"
+
 broccoli-kitchen-sink-helpers@^0.2.5:
   version "0.2.9"
   resolved "https://registry.yarnpkg.com/broccoli-kitchen-sink-helpers/-/broccoli-kitchen-sink-helpers-0.2.9.tgz#a5e0986ed8d76fb5984b68c3f0450d3a96e36ecc"