From 82ec6bfd86f551f52b015a826c2362c078619762 Mon Sep 17 00:00:00 2001
From: Ilya Radchenko <knownasilya@gmail.com>
Date: Wed, 9 Sep 2020 13:20:14 -0400
Subject: [PATCH] chore: test against embroider

---
 .travis.yml        |  2 ++
 ember-cli-build.js | 15 ++++++++++++++-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 30a1fe5..35a928b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -29,6 +29,7 @@ jobs:
   fast_finish: true
   allow_failures:
     - env: EMBER_TRY_SCENARIO=ember-canary
+    - env: EMBER_TRY_SCENARIO=embroider-tests
 
   include:
     # runs linting and tests with current locked deps
@@ -54,6 +55,7 @@ jobs:
     - env: EMBER_TRY_SCENARIO=ember-canary
     - env: EMBER_TRY_SCENARIO=ember-default-with-jquery
     - env: EMBER_TRY_SCENARIO=ember-classic
+    - env: EMBER_TRY_SCENARIO=embroider-tests
 
 script:
   - node_modules/.bin/ember try:one $EMBER_TRY_SCENARIO
diff --git a/ember-cli-build.js b/ember-cli-build.js
index 7e7f898..9932ddc 100644
--- a/ember-cli-build.js
+++ b/ember-cli-build.js
@@ -25,5 +25,18 @@ module.exports = function (defaults) {
     destDir: '/fonts',
   });
 
-  return mergeTrees([app.toTree(), fonts]);
+  let appWithFonts = mergeTrees([app.toTree(), fonts]);
+
+  if ('@embroider/webpack' in app.dependencies()) {
+    const { Webpack } = require('@embroider/webpack'); // eslint-disable-line
+    return require('@embroider/compat') // eslint-disable-line
+      .compatBuild(appWithFonts, Webpack, {
+        staticAddonTestSupportTrees: true,
+        staticAddonTrees: true,
+        staticHelpers: true,
+        staticComponents: true,
+      });
+  }
+
+  return appWithFonts;
 };