Skip to content

Commit

Permalink
Removing default addon blueprint and moving dependencies to npm.
Browse files Browse the repository at this point in the history
  • Loading branch information
Garrett Murphey committed Jun 26, 2017
1 parent a3ff91e commit 7c0d336
Show file tree
Hide file tree
Showing 4 changed files with 31 additions and 25 deletions.
18 changes: 0 additions & 18 deletions blueprints/ember-hifi/index.js

This file was deleted.

2 changes: 0 additions & 2 deletions bower.json
Original file line number Diff line number Diff line change
@@ -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"
}
Expand Down
30 changes: 26 additions & 4 deletions index.js
Original file line number Diff line number Diff line change
@@ -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) {
Expand All @@ -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;
}
Expand Down
6 changes: 5 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,13 @@
"web"
],
"dependencies": {
"broccoli-funnel": "^1.2.0",
"broccoli-merge-trees": "^2.0.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"
Expand Down

0 comments on commit 7c0d336

Please sign in to comment.