Merge pull request #599 from thoov/embroider-macros

Embroider support when staticAddonTestSupportTrees enabled

Author: ef4

.travis.yml

@@ -55,6 +55,10 @@ 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
+    - env: EMBER_TRY_SCENARIO=embroider TEST_FRAMEWORK=ember-mocha
+    - env: EMBER_TRY_SCENARIO=embroider-optimized
+    - env: EMBER_TRY_SCENARIO=embroider-optimized TEST_FRAMEWORK=ember-mocha
 
 before_install:
   - curl -o- -L https://yarnpkg.com/install.sh | bash

addon-test-support/-private/get-test-loader.js

@@ -1,4 +1,4 @@
-/* globals require, requirejs */
+import { dependencySatisfies, macroCondition, importSync } from '@embroider/macros';
 
 /**
  * Returns ember-exam-qunit-test-loader or ember-exam-mocha-test-loader
@@ -8,11 +8,11 @@
  * @return {Object}
  */
 export default function getTestLoader() {
-  if (requirejs.entries['ember-qunit/test-loader']) {
-    const EmberExamQUnitTestLoader = require('./ember-exam-qunit-test-loader');
+  if (macroCondition(dependencySatisfies('ember-qunit', '*'))){
+    const EmberExamQUnitTestLoader = importSync('./ember-exam-qunit-test-loader');
     return EmberExamQUnitTestLoader['default'];
-  } else if (requirejs.entries['ember-mocha/test-loader']) {
-    const EmberExamMochaTestLoader = require('./ember-exam-mocha-test-loader');
+  } else if (macroCondition(dependencySatisfies('ember-mocha', '*'))){
+    const EmberExamMochaTestLoader = importSync('./ember-exam-mocha-test-loader');
     return EmberExamMochaTestLoader['default'];
   }
 

addon-test-support/start.js

@@ -1,6 +1,5 @@
-/* globals require */
-
 import loadEmberExam from 'ember-exam/test-support/load';
+import { dependencySatisfies, macroCondition, importSync } from '@embroider/macros';
 
 /**
  * Equivalent to ember-qunit or ember-mocha's loadTest() except this does not create a new TestLoader instance
@@ -26,14 +25,18 @@ function loadTests(testLoader) {
  * @param {*} qunitOptions
  */
 export default function start(qunitOptions) {
-  const framework = require.has('ember-qunit') ? 'qunit' : 'mocha';
   const modifiedOptions = qunitOptions || Object.create(null);
   modifiedOptions.loadTests = false;
 
   const testLoader = loadEmberExam();
   loadTests(testLoader);
 
-  const emberTestFramework = require(`ember-${framework}`);
+  let emberTestFramework;
+  if (macroCondition(dependencySatisfies('ember-qunit', '*'))){
+    emberTestFramework = importSync('ember-qunit');
+  } else if (macroCondition(dependencySatisfies('ember-mocha', '*'))) {
+    emberTestFramework = importSync('ember-mocha');
+  }
 
   if (emberTestFramework.start) {
     emberTestFramework.start(modifiedOptions);

config/ember-try.js

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

ember-cli-build.js

@@ -14,5 +14,23 @@ module.exports = function(defaults) {
     behave. You most likely want to be modifying `./index.js` or app's build file
   */
 
-  return app.toTree();
+  // Use embroider if it's present (it can get added by ember-try)
+  if ('@embroider/core' in app.dependencies()) {
+    /* eslint-disable node/no-missing-require, node/no-extraneous-require */
+    const { Webpack } = require('@embroider/webpack');
+    const { compatBuild } = require('@embroider/compat');
+    /* eslint-enable node/no-missing-require, node/no-extraneous-require */
+    let config = {};
+    if (process.env.EMBER_TRY_SCENARIO === 'embroider-optimized') {
+      config = {
+        staticAddonTrees: true,
+        staticAddonTestSupportTrees: true,
+        staticHelpers: true,
+        staticComponents: true,
+      }
+    }
+    return compatBuild(app, Webpack, config);
+  } else {
+    return app.toTree();
+  }
 };

package.json

@@ -29,6 +29,7 @@
     "test:node": "nyc mocha 'node-tests/**/*-test.js'"
   },
   "dependencies": {
+    "@embroider/macros": "^0.26.0",
     "chalk": "^4.1.0",
     "cli-table3": "^0.6.0",
     "debug": "^4.1.0",
@@ -46,7 +47,7 @@
     "babel-eslint": "^10.1.0",
     "codeclimate-test-reporter": "^0.5.0",
     "ember-cli": "^3.21.2",
-    "ember-cli-addon-docs": "^0.6.15",
+    "ember-cli-addon-docs": "^0.10.0",
     "ember-cli-addon-docs-yuidoc": "^0.2.4",
     "ember-cli-dependency-checker": "^3.0.0",
     "ember-cli-deploy": "^1.0.2",
@@ -80,6 +81,18 @@
     "sinon": "^9.0.3",
     "testdouble": "^3.16.1"
   },
+  "peerDependencies": {
+    "ember-mocha": "*",
+    "ember-qunit": "*"
+  },
+  "peerDependenciesMeta": {
+    "ember-qunit": {
+      "optional": true
+    },
+    "ember-mocha": {
+      "optional": true
+    }
+  },
   "engines": {
     "node": "10.* || >= 12"
   },

tests/test-helper.js

@@ -3,8 +3,9 @@
 import { setResolver } from '@ember/test-helpers';
 import resolver from './helpers/resolver';
 import start from 'ember-exam/test-support/start';
+import { macroCondition, dependencySatisfies } from '@embroider/macros';
 
-const oppositeFramework = !require.has('ember-qunit') ? 'qunit' : 'mocha';
+const oppositeFramework = macroCondition(dependencySatisfies('ember-qunit', '*')) ? 'mocha': 'qunit';
 
 Object.keys(require.entries).forEach((entry) => {
   if (entry.indexOf(oppositeFramework) !== -1) {

tests/unit/mocha/testem-output-test.js

@@ -1,6 +1,6 @@
 import { describe, it } from 'mocha';
 import { expect } from 'chai';
-import TestemOutput from 'ember-exam/test-support/-private/patch-testem-output';
+import * as TestemOutput from 'ember-exam/test-support/-private/patch-testem-output';
 
 describe('Unit | Mocha | patch-testem-output', () => {
   it('add partition number to test name when `split` is passed', function() {

tests/unit/qunit/testem-output-test.js

@@ -1,5 +1,5 @@
 import { module, test } from 'qunit';
-import TestemOutput from 'ember-exam/test-support/-private/patch-testem-output';
+import * as TestemOutput from 'ember-exam/test-support/-private/patch-testem-output';
 
 module('Unit | Qunit | patch-testem-output', () => {
   test('add partition number to test name when `split` is passed', function(assert) {