Revert "Switch to treeForAddonTestSupport (#89)"

This reverts commit 0723629.
mainmatter · Apr 7, 2017 · 73f5cab · 73f5cab
1 parent c38c95e
commit 73f5cab
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 17 deletions.
diff --git a/addon-test-support/.eslintrc.js → addon/.eslintrc.js b/addon-test-support/.eslintrc.js → addon/.eslintrc.js
diff --git a/addon-test-support/index.js → addon/index.js b/addon-test-support/index.js → addon/index.js
diff --git a/...upport/utils/bind-data-test-attributes.js → addon/utils/bind-data-test-attributes.js b/...upport/utils/bind-data-test-attributes.js → addon/utils/bind-data-test-attributes.js
diff --git a/index.js b/index.js
@@ -3,7 +3,6 @@
 /* eslint-env node */
 
 const VersionChecker = require('ember-cli-version-checker');
-const Funnel = require('broccoli-funnel');
 
 module.exports = {
   name: 'ember-test-selectors',
@@ -80,20 +79,11 @@ module.exports = {
     }
   },
 
-  treeForAddonTestSupport(tree) {
-    // intentionally not calling _super here
-    // so that can have our `import`'s be
-    // import testSelector from 'ember-test-selectors';
-
-    let namespacedTree = new Funnel(tree, {
-      srcDir: '/',
-      destDir: `/${this.moduleName()}`,
-      annotation: `Addon#treeForTestSupport (${this.name})`,
-    });
-
-    return this.preprocessJs(namespacedTree, '/', this.name, {
-      registry: this.registry,
-    });
+  treeForAddon() {
+    // remove our "addon" folder from the build if we're stripping test selectors
+    if (!this._stripTestSelectors) {
+      return this._super.treeForAddon.apply(this, arguments);
+    }
   },
 
   preprocessTree(type, tree) {

diff --git a/package.json b/package.json
@@ -24,8 +24,6 @@
     "test:strip": "STRIP_TEST_SELECTORS=true ember test"
   },
   "dependencies": {
-    "broccoli-funnel": "^1.1.0",
-    "broccoli-stew": "^1.4.0",
     "ember-cli-babel": "^5.1.7",
     "ember-cli-version-checker": "^1.2.0"
   },