Merge pull request #86 from kiwiupover/adding-embroider-test

Author: rwjblue

.github/workflows/build.yml

@@ -30,6 +30,7 @@ jobs:
           - lts-3.8
           - lts-3.4
           - lts-2.18
+          - embroider
     steps:
       - name: Checkout
         uses: actions/checkout@v1

config/ember-try.js

@@ -113,6 +113,16 @@ module.exports = async function() {
             edition: 'classic'
           }
         }
+      },
+      {
+        name: 'ember-embroider',
+        npm: {
+          devDependencies: {
+            '@embroider/core': '*',
+            '@embroider/webpack': '*',
+            '@embroider/compat': '*',
+          },
+        },
       }
     ]
   };

ember-cli-build.js

@@ -14,5 +14,16 @@ module.exports = function(defaults) {
     behave. You most likely want to be modifying `./index.js` or app's build file
   */
 
+  if ('@embroider/webpack' in app.dependencies()) {
+    const { Webpack } = require('@embroider/webpack'); // eslint-disable-line
+    return require('@embroider/compat') // eslint-disable-line
+      .compatBuild(app, Webpack, {
+        staticAddonTestSupportTrees: true,
+        staticAddonTrees: true,
+        staticHelpers: true,
+        staticComponents: true,
+      });
+  }
+
   return app.toTree();
 };

fastboot-tests/fastboot-1.0-test.js

@@ -6,7 +6,8 @@ const setupTest = require('ember-fastboot-addon-tests').setupTest;
 
 describe('FastBoot 2.0', function() {
   setupTest('fastboot', {
-    emberCliFastbootVersion: '2.0.0'
+    emberCliFastbootVersion: '2.0.0',
+    emberVersion: 'latest'
   });
 
   it('index page', function() {

package.json

@@ -70,6 +70,9 @@
   "publishConfig": {
     "registry": "https://registry.npmjs.org"
   },
+  "resolutions": {
+    "fastboot": "3.1.0"
+  },
   "ember": {
     "edition": "octane"
   },