update build

build/broccoli/build-packages.js

@@ -23,7 +23,10 @@ module.exports = function buildPackages(es2017, matrix) {
   let es5 = transpileToES5(es2017);
   let targets = { es5, es2017 };
 
+  // We ignore the `@glimmer/blueprint` tree as it is ember-only, and is picked
+  // up later on in the build process.
   let packages = project.packages
+    .filter(pkg => pkg.name !== '@glimmer/blueprint')
     .map(buildPackage);
 
   packages = flatten(packages);
@@ -32,24 +35,10 @@ module.exports = function buildPackages(es2017, matrix) {
   return packages;
 
   function buildPackage(pkg) {
-    let pkgName = pkg.name;
-    let builds;
-
-    // The blueprint package is structured differently from other packages, so
-    // we just copy it over verbatim to the build output.
-    if (pkgName === '@glimmer/blueprint') {
-      builds = [funnel(`packages/${pkgName}`, {
-        destDir: `${pkgName}/`,
-        exclude: ['**/node_modules/**']
-      })];
-    } else {
-      builds = buildMatrix(pkgName, matrix);
-    }
-
     return [
-      writePackageJSON(pkgName),
-      writeLicense(`${pkgName}/LICENSE`),
-      ...builds
+      writePackageJSON(pkg.name),
+      writeLicense(`${pkg.name}/LICENSE`),
+      ...buildMatrix(pkg.name, matrix)
     ];
   }
 

ember-cli-build.js

@@ -66,9 +66,31 @@ module.exports = function(_options) {
     ];
   }
 
+  // Include any Ember Addon files, without src (Glimmer only) or TS files
+  let emberTree = funnel('packages/', {
+    exclude: [
+      '**/node_modules',
+      '**/tmp',
+      '**/types',
+      '**/dist',
+      '**/src',
+      '**/test',
+      '**/*.ts'
+    ]
+  });
+
+  // Grab the Ember Addon files from the TS build. This ignores dummy app output
+  // as well, since dummy apps have an `app` directory.
+  let emberJsTree = funnel(jsTree, {
+    include: [
+      '*/*/addon/**',
+      '*/*/app/**',
+    ]
+  });
+
   // Third, build our module/ES combinations for each package, and their tests.
   let packagesTree = buildPackages(jsTree, matrix);
   let testsTree = buildTests(tsTree, jsTree, packagesTree);
 
-  return merge([packagesTree, testsTree]);
+  return merge([packagesTree, testsTree, emberTree, emberJsTree], { overwrite: true });
 }