fix: cleanup

Author: mike-north

blueprints/ember-cli-typescript/index.js

@@ -33,10 +33,12 @@ module.exports = {
     let hasMirage = 'ember-cli-mirage' in (this.project.pkg.devDependencies || {});
     let isAddon = this.project.isEmberCLIAddon();
     let isMU = this._detectMU();
-    let includes = isMU ? ['src'] : ['app', 'tests', 'types'].filter(Boolean);
+    let includes = isMU ? ['src'] : ['app', isAddon && 'addon'].filter(Boolean);
 
-    if (isAddon) {
-      includes.push('addon', 'test-support', 'addon-test-support');
+    includes = includes.concat(['tests', 'types']).concat(inRepoAddons);
+
+    if (isAddon && !isMU) {
+      includes.push('test-support', 'addon-test-support');
     }
     // Mirage is already covered for addons because it's under `tests/`
     if (hasMirage && !isAddon) {

index.js

@@ -4,6 +4,7 @@
 const IncrementalTypescriptCompiler = require('./lib/incremental-typescript-compiler');
 const Funnel = require('broccoli-funnel');
 const MergeTrees = require('broccoli-merge-trees');
+const stew = require('broccoli-stew');
 
 module.exports = {
   name: 'ember-cli-typescript',
@@ -57,7 +58,8 @@ module.exports = {
       return this._super.treeForApp.call(this, tree);
     }
   },
-  // We manually invoke Babel for treeForAddon, treeForTestSupport and treeForAddonTestSupport
+
+  // We manually invoke Babel for treeForAddon and treeForAddonTestSupport
   // rather than calling _super because we're returning content on behalf of addons that aren't
   // ember-cli-typescript, and the _super impl would namespace all the files under our own name.
   treeForAddon() {
@@ -74,7 +76,9 @@ module.exports = {
       trees.push(this.compiler.treeForTests());
       trees.push(this.compiler.treeForTestSupport());
     }
-    return this._super.treeForTestSupport.call(this, new MergeTrees(trees));
+    return this._super.treeForTestSupport.call(this, 
+      stew.mv(new MergeTrees(trees), 'test-support/*', '/')
+    );
   },
 
   treeForAddonTestSupport() {

lib/incremental-typescript-compiler/index.js

@@ -100,7 +100,7 @@ module.exports = class IncrementalTypescriptCompiler {
   treeForTestSupport() {
     let paths = {};
     for (let addon of this.addons) {
-      paths[`${this._relativeAddonRoot(addon)}/test-support`] = `tests`;
+      paths[`${this._relativeAddonRoot(addon)}/test-support`] = `test-support`;
     }
     return new TypescriptOutput(this, paths);
   }

lib/utilities/update-paths-for-addon.js

@@ -12,6 +12,7 @@ module.exports = function(paths, addonName, appName, options) {
   let appStarPaths;
   paths = paths || {};
   appStarPaths = paths[appNameStar] = paths[appNameStar] || [];
+
   if (options.removePaths) {
     if (paths.hasOwnProperty(addonName)) {
       delete paths[addonName];

node-tests/blueprints/ember-cli-typescript-test.js

@@ -23,14 +23,14 @@ describe('Acceptance: ember-cli-typescript generator', function() {
         // Mock npm-install that only modifies package.json
         return {
           run: function(options) {
-            let pkgJson = fs.readJsonSync('package.json')
+            let pkgJson = fs.readJsonSync('package.json');
             options.packages.forEach(function(pkg) {
               let pkgName = pkg.match(/^(.*)@[^@]*$/);
               pkgJson['devDependencies'][pkgName[1]] = '*';
             });
             fs.writeJsonSync('package.json', pkgJson);
           }
-        }
+        };
       }
       return originalTaskForFn.call(this, taskName);
     };
@@ -121,11 +121,11 @@ describe('Acceptance: ember-cli-typescript generator', function() {
 
         expect(tsconfigJson.include).to.deep.equal([
           'app/**/*',
+          'addon/**/*',
           'tests/**/*',
           'types/**/*',
-          'addon/**/*',
           'test-support/**/*',
-          'addon-test-support/**/*'
+          'addon-test-support/**/*',
         ]);
 
         const projectTypes = file('types/dummy/index.d.ts');
@@ -168,7 +168,10 @@ describe('Acceptance: ember-cli-typescript generator', function() {
           expect(pkgJson.devDependencies).to.include.all.keys('@types/ember-data');
           expect(pkgJson.devDependencies).to.include.all.keys('ember-cli-qunit');
           expect(pkgJson.devDependencies).to.include.all.keys('@types/ember-qunit', '@types/qunit');
-          expect(pkgJson.devDependencies).to.not.have.any.keys('@types/ember-mocha', '@types/mocha');
+          expect(pkgJson.devDependencies).to.not.have.any.keys(
+            '@types/ember-mocha',
+            '@types/mocha'
+          );
 
           const tsconfig = file('tsconfig.json');
           expect(tsconfig).to.exist;
@@ -214,7 +217,10 @@ describe('Acceptance: ember-cli-typescript generator', function() {
           expect(pkgJson.devDependencies).to.not.have.any.keys('@types/ember-data');
           expect(pkgJson.devDependencies).to.include.all.keys('ember-cli-qunit');
           expect(pkgJson.devDependencies).to.include.all.keys('@types/ember-qunit', '@types/qunit');
-          expect(pkgJson.devDependencies).to.not.have.any.keys('@types/ember-mocha', '@types/mocha');
+          expect(pkgJson.devDependencies).to.not.have.any.keys(
+            '@types/ember-mocha',
+            '@types/mocha'
+          );
 
           const tsconfig = file('tsconfig.json');
           expect(tsconfig).to.exist;
@@ -275,7 +281,13 @@ describe('Acceptance: ember-cli-typescript generator', function() {
           '*': ['types/*'],
         });
 
-        expect(json.include).to.deep.equal(['app/**/*', 'tests/**/*', 'types/**/*', 'lib/my-addon-1/**/*', 'lib/my-addon-2/**/*']);
+        expect(json.include).to.deep.equal([
+          'app/**/*',
+          'tests/**/*',
+          'types/**/*',
+          'lib/my-addon-1/**/*',
+          'lib/my-addon-2/**/*',
+        ]);
 
         const projectTypes = file('types/my-app/index.d.ts');
         expect(projectTypes).to.exist;
@@ -344,11 +356,11 @@ describe('Acceptance: ember-cli-typescript generator', function() {
 
         expect(json.include).to.deep.equal([
           'app/**/*',
+          'addon/**/*',
           'tests/**/*',
           'types/**/*',
-          'addon/**/*',
           'test-support/**/*',
-          'addon-test-support/**/*'
+          'addon-test-support/**/*',
         ]);
       });
   });