Fixed the damn ember-cli-qunit build

Author: Gaurav0

.gitignore

@@ -19,6 +19,7 @@
 npm-debug.log*
 yarn-error.log
 testem.log
+.vscode
 
 # ember-try
 .node_modules.ember-try/

ember-cli-build.js

@@ -7,6 +7,7 @@ module.exports = function(defaults) {
   const concat = require('broccoli-concat');
   const mergeTrees = require('broccoli-merge-trees');
   const babelTranspiler = require('broccoli-babel-transpiler');
+  const Rollup = require('broccoli-rollup');
   const browserify = require('browserify');
   const path = require('path');
   const fs = require('fs');
@@ -150,9 +151,42 @@ module.exports = function(defaults) {
   let transpiledInitializersTree = babelTranspiler(baseInitializersTree, babelOpts());
 
   let finalTestHelpersTree = buildAddonTree('ember-test-helpers');
-  console.log(app.preprocessJs);
-  let finalQUnitTree = buildAddonTree('ember-qunit', {
-    excludes: ['addon-test-support/ember-qunit/legacy-2-x/**/*.js']
+  
+  let preprocessJs = app.registry.registry.js[0].toTree;
+  let buildPreprocessedAddon = function(addonName) {
+    return preprocessJs(path.dirname(require.resolve(addonName)) + '/addon-test-support', {
+      registry: app.registry
+    });
+  };
+  let qunitTree = buildPreprocessedAddon('ember-qunit');
+  let testHelpersTreeForQUnit = buildPreprocessedAddon('@ember/test-helpers');
+  let testLoaderTreeForQUnit = funnel("node_modules/ember-cli-test-loader/addon-test-support", {
+    files: ['index.js'],
+    getDestinationPath: function() {
+      return "ember-cli-test-loader/test-support/index.js";
+    }
+  });
+  testLoaderTreeForQUnit = new Rollup(testLoaderTreeForQUnit, {
+    rollup: {
+      input: 'ember-cli-test-loader/test-support/index.js',
+      output: {
+        file: 'ember-cli-test-loader/test-support/index.js',
+        format: 'es'
+      },
+      plugins: [
+        require('rollup-plugin-commonjs')(),
+        // require('rollup-plugin-babel')({
+        //   babelrc: false,
+        //   modules: false,
+        //   externalHelpers: true
+        // })
+      ]
+    }
+  });
+  testLoaderTreeForQUnit = babelTranspiler(testLoaderTreeForQUnit, babelOpts());
+  let finalQUnitTree = concat(mergeTrees([qunitTree, testHelpersTreeForQUnit, testLoaderTreeForQUnit]), {
+    inputFiles: ['**/*.js'],
+    outputFile: '/assets/ember-qunit.js'
   });
 
   let mergedDepsTree = mergeTrees([bowerTree, shimsTree, transpiledInitializersTree, transpiledResolverTree, emberDataShims]);
@@ -170,18 +204,15 @@ module.exports = function(defaults) {
   return app.toTree(mergeTrees([twiddleVendorTree, loaderTree, testLoaderTree, finalTestHelpersTree, finalQUnitTree]));
 };
 
-function buildAddonTree(addonName, options = {}) {
+function buildAddonTree(addonName) {
   const funnel = require('broccoli-funnel');
   const concat = require('broccoli-concat');
   const babelTranspiler = require('broccoli-babel-transpiler');
   const path = require('path');
 
-  let { excludes } = options;
-  excludes = excludes || [];
-
   let baseTree = funnel(path.dirname(require.resolve(addonName)), {
     include: ['**/*.js'],
-    exclude: ['index.js', 'ember-cli-build.js', 'testem.js', 'lib/**/*.js', 'config/**/*.js', 'tests/**/*.js'].concat(excludes)
+    exclude: ['index.js', 'ember-cli-build.js', 'testem.js', 'lib/**/*.js', 'config/**/*.js', 'tests/**/*.js']
   });
 
   let transpiledTree = babelTranspiler(baseTree, babelOpts());
@@ -200,7 +231,8 @@ function babelOpts() {
       ['transform-es2015-modules-amd', {
         loose: true,
         noInterop: true
-      }]
+      }],
+      ['babel-plugin-ember-modules-api-polyfill']
     ]
   };
 }

package.json

@@ -17,14 +17,17 @@
   "author": "Ember Twiddle Contributors",
   "license": "MIT",
   "devDependencies": {
+    "@ember/test-helpers": "~0.7.18",
     "babel-plugin-ember-modules-api-polyfill": "^2.3.0",
+    "babel-preset-env": "^1.7.0",
     "babel-preset-es2017": "^6.24.1",
     "babel-standalone": "^6.26.0",
     "broccoli-asset-rev": "^2.4.5",
     "broccoli-babel-transpiler": "^6.1.4",
     "broccoli-concat": "^3.2.2",
     "broccoli-funnel": "^2.0.1",
     "broccoli-merge-trees": "^3.0.0",
+    "broccoli-rollup": "^2.1.1",
     "browserify": "^16.2.0",
     "compare-versions": "^3.2.1",
     "dedent": "~0.7.0",
@@ -54,6 +57,7 @@
     "ember-cli-mirage": "~0.4.4",
     "ember-cli-moment-shim": "^2.2.1",
     "ember-cli-node-assets": "~0.2.2",
+    "ember-cli-preprocess-registry": "^3.1.1",
     "ember-cli-qunit": "~4.3.0",
     "ember-cli-release": "1.0.0-beta.2",
     "ember-cli-sass": "^6.2.0",
@@ -84,6 +88,9 @@
     "moment": "^2.22.0",
     "moment-timezone": "~0.5.14",
     "path-browser": "^2.2.1",
+    "rollup": "^0.60.7",
+    "rollup-plugin-babel": "^3.0.4",
+    "rollup-plugin-commonjs": "^9.1.3",
     "rollup-plugin-json": "^2.3.0",
     "rollup-plugin-node-builtins": "^2.1.2",
     "torii": "~0.10.1"