From 3157f72ba49e9a17dca17eaebbfcb7c662756805 Mon Sep 17 00:00:00 2001
From: Garrett Murphey <gmurphey@trovedata.com>
Date: Fri, 23 Jun 2017 19:06:47 -0400
Subject: [PATCH] Removing default addon blueprint and moving dependencies to
 npm.

---
 blueprints/ember-hifi/index.js | 18 ------------------
 bower.json                     |  2 --
 index.js                       | 30 ++++++++++++++++++++++++++----
 package.json                   |  6 +++++-
 4 files changed, 31 insertions(+), 25 deletions(-)
 delete mode 100644 blueprints/ember-hifi/index.js

diff --git a/blueprints/ember-hifi/index.js b/blueprints/ember-hifi/index.js
deleted file mode 100644
index cbd06a9..0000000
--- a/blueprints/ember-hifi/index.js
+++ /dev/null
@@ -1,18 +0,0 @@
-/*jshint node:true*/
-module.exports = {
-  description: '',
-  normalizeEntityName: function() {},
-  // locals: function(options) {
-  //   // Return custom template variables here.
-  //   return {
-  //     foo: options.entity.options.foo
-  //   };
-  // }
-
-  afterInstall: function(options) {
-    return this.addBowerPackagesToProject([
-      {name:"hls.js", target: "^0.6.1"},
-      {name: "howler.js", target: "^2.0.0"}
-    ]);
-  }
-};
diff --git a/bower.json b/bower.json
index 56bf110..c6ba378 100644
--- a/bower.json
+++ b/bower.json
@@ -1,8 +1,6 @@
 {
   "name": "ember-hifi",
   "dependencies": {
-    "howler.js": "howler#^2.0.0",
-    "hls.js": "^0.6.1",
     "remarkable": "^1.7.1",
     "highlightjs": "^9.10.0"
   }
diff --git a/index.js b/index.js
index 265127c..6161332 100644
--- a/index.js
+++ b/index.js
@@ -1,6 +1,10 @@
 /* eslint-env node */
 'use strict';
 
+var path = require('path');
+var Funnel = require('broccoli-funnel');
+var mergeTrees = require('broccoli-merge-trees');
+
 module.exports = {
   name: 'ember-hifi',
   included(app, parentAddon) {
@@ -11,16 +15,34 @@ module.exports = {
       target = target.app;
     }
 
-    target.import(target.bowerDirectory + '/howler.js/dist/howler.js');
-    target.import('vendor/howler.js');
+    target.import({
+      development: 'vendor/third-party/howler.js',
+      production: 'vendor/third-party/howler.min.js'
+    });
 
     target.import({
-      development: target.bowerDirectory + '/hls.js/dist/hls.js',
-      production: target.bowerDirectory + '/hls.js/dist/hls.min.js'
+      development: 'vendor/third-party/hls.js',
+      production: 'vendor/third-party/hls.min.js'
     });
+
+    target.import('vendor/howler.js');
     target.import('vendor/hls.js');
   },
 
+  treeForVendor(vendorTree) {
+    var howlerTree = new Funnel(path.dirname(require.resolve('howler')), {
+      files: ['howler.js', 'howler.min.js'],
+      destDir: 'third-party'
+    });
+
+    var hlsTree = new Funnel(path.dirname(require.resolve('hls.js')), {
+      files: ['hls.js', 'hls.min.js', 'hls.js.map'],
+      destDir: 'third-party'
+    });
+
+    return mergeTrees([vendorTree, howlerTree, hlsTree]);
+  },
+
   isDevelopingAddon: function() {
     return true;
   }
diff --git a/package.json b/package.json
index 2e1a934..69f45c3 100644
--- a/package.json
+++ b/package.json
@@ -59,9 +59,13 @@
     "web"
   ],
   "dependencies": {
+    "broccoli-funnel": "^1.2.0",
+    "broccoli-merge-trees": "^1.2.0",
     "ember-cli-babel": "^5.1.7",
     "ember-getowner-polyfill": "^1.0.1",
-    "ember-poll": "^1.0.1"
+    "ember-poll": "^1.0.1",
+    "hls.js": "^0.7.9",
+    "howler": "^2.0.4"
   },
   "ember-addon": {
     "configPath": "tests/dummy/config"