Merge pull request #6 from alexlafroscia/u/alexlafroscia/remove-vendor-shim

Remove vendor shim

Author: alexblom

index.js

@@ -1,24 +1,38 @@
-/* jshint node: true */
+/* eslint-env node */
+
 'use strict';
 
 var path = require('path');
 var Funnel = require('broccoli-funnel');
 var MergeTrees = require('broccoli-merge-trees');
 
+var tdDirectory = path.resolve(path.dirname(require.resolve('testdouble')), '..');
+
 module.exports = {
   name: 'ember-cli-testdouble',
 
+  treeForVendor(vendorTree) {
+    var trees = [];
+
+    if (vendorTree) {
+      trees.push(vendorTree);
+    }
+
+    trees.push(new Funnel(tdDirectory));
+
+    return new MergeTrees(trees);
+  },
+
   included(app) {
     this._super.included.apply(this, arguments);
-    app.import('vendor/testdouble.js', { type: 'test' });
-    app.import('vendor/shims/testdouble.js', { type: 'test' });
-  },
 
-  treeForVendor(vendorTree) {
-    var tdTree = new Funnel(path.join(this.project.root, 'node_modules', 'testdouble', 'dist'), {
-      files: ['testdouble.js']
-    });
+    var vendorPath = this.treePaths.vendor;
 
-    return new MergeTrees([vendorTree, tdTree]);
+    app.import(`${vendorPath}/dist/testdouble.js`, {
+      type: 'test',
+      using: [
+        { transformation: 'amd', as: 'testdouble' }
+      ]
+    });
   }
 };