Merge pull request #3 from mwisner/feat/npm

Remove Bower, add Yarn, add example dummy component

.travis.yml

@@ -1,17 +1,16 @@
 ---
 language: node_js
 node_js:
- - "4"
+ - "6"
 
 sudo: false
 
 cache:
+ yarn: true
  directories:
- - $HOME/.npm
- - $HOME/.cache # includes bowers cache
+ - node_modules
 
 env:
- # we recommend testing LTS's and latest stable release (bonus points to beta/canary)
  - EMBER_TRY_SCENARIO=ember-lts-2.4
  - EMBER_TRY_SCENARIO=ember-lts-2.8
  - EMBER_TRY_SCENARIO=ember-release
@@ -25,14 +24,12 @@ matrix:
  - env: EMBER_TRY_SCENARIO=ember-canary
 
 before_install:
- - npm config set spin false
- - npm install -g bower phantomjs-prebuilt
- - bower --version
+ - npm install -g yarn phantomjs-prebuilt
+ - yarn --version
  - phantomjs --version
 
 install:
- - npm install
- - bower install
+ - yarn install
 
 script:
  # Usually, it's ok to finish the test scenario without reverting

README.md

@@ -22,10 +22,6 @@ import videojs from 'videojs';
 - [ ] FastBoot support
 - [ ] Plugin support
 
-## Upgrading
-
-Be sure to rerun the default blueprint with `ember g ember-cli-videojs-shim` if upgrading by bumping the version number in package.json.
-
 ## License
 
 ember-cli-videojs-shim shims is [MIT Licensed](https://github.com/joshuairl/ember-cli-videojs-shim/blob/master/LICENSE.md).

index.js

@@ -1,28 +1,28 @@
 /* jshint node: true */
 'use strict';
 
-var path = require('path');
+const path = require('path');
+const Funnel = require('broccoli-funnel');
+const MergeTrees = require('broccoli-merge-trees');
 
 module.exports = {
  name: 'videojs',
 
- blueprintsPath: function() {
- return path.join(__dirname, 'blueprints');
- },
-
  included: function(app) {
+ this._super.included.apply(this, arguments);
+
  if (!process.env.EMBER_CLI_FASTBOOT) {
- var options = app.options.videojs || {};
+ let options = app.options.videojs || {};
 
  app.import({
- development: path.join(app.bowerDirectory, 'video.js/video-js.css'),
- production: path.join(app.bowerDirectory, 'video.js/video-js.min.css')
+ development: path.join('vendor/video-js.css'),
+ production: path.join('vendor/video-js.min.css')
  });
 
- app.import(path.join(app.bowerDirectory, 'video.js/font/VideoJS.eot'), { destDir: 'assets/font' });
- app.import(path.join(app.bowerDirectory, 'video.js/font/VideoJS.svg'), { destDir: 'assets/font' });
- app.import(path.join(app.bowerDirectory, 'video.js/font/VideoJS.ttf'), { destDir: 'assets/font' });
- app.import(path.join(app.bowerDirectory, 'video.js/font/VideoJS.woff'), { destDir: 'assets/font' });
+ app.import(path.join('vendor/font/VideoJS.eot'), { destDir: 'assets/font' });
+ app.import(path.join('vendor/font/VideoJS.svg'), { destDir: 'assets/font' });
+ app.import(path.join('vendor/font/VideoJS.ttf'), { destDir: 'assets/font' });
+ app.import(path.join('vendor/font/VideoJS.woff'), { destDir: 'assets/font' });
 
  app.import('vendor/ember-cli-videojs-shim/shims.js', {
  exports: {
@@ -31,15 +31,29 @@ module.exports = {
  });
 
  app.import({
- development: path.join(app.bowerDirectory, 'video.js/video.js'),
- production: path.join(app.bowerDirectory, 'video.js/video.min.js')
+ development: path.join('vendor/video.js'),
+ production: path.join('vendor/video.min.js')
  });
 
  (options.languages || []).forEach(function(language) {
- app.import(path.join(app.bowerDirectory, 'video.js/lang/' + language + '.js'));
+ app.import(path.join('vendor/lang/' + language + '.js'));
  });
 
- app.import(path.join(app.bowerDirectory, 'video.js/video-js.swf'), { destDir: 'assets' });
+ app.import(path.join('vendor/video-js.swf'), { destDir: 'assets' });
+ }
+ },
+
+ treeForVendor(vendorTree) {
+ let trees = [];
+
+ if (vendorTree) {
+ trees.push(vendorTree);
  }
- }
+
+ trees.push(
+ new Funnel(path.join(path.dirname(require.resolve('video.js'))))
+ );
+
+ return new MergeTrees(trees);
+ },
 };

package.json

@@ -23,7 +23,10 @@
  "test": "ember try:each"
  },
  "dependencies": {
- "ember-cli-babel": "^5.1.7"
+ "broccoli-funnel": "^2.0.1",
+ "broccoli-merge-trees": "^2.0.0",
+ "ember-cli-babel": "^5.1.7",
+ "video.js": "^6.2.7"
  },
  "devDependencies": {
  "broccoli-asset-rev": "^2.4.5",
@@ -47,7 +50,6 @@
  "ember-load-initializers": "^0.6.0",
  "ember-resolver": "^2.0.3",
  "ember-source": "~2.11.0",
- "ember-welcome-page": "^2.0.2",
  "loader.js": "^4.0.10"
  },
  "engines": {

tests/dummy/app/components/video-test.js

@@ -0,0 +1,21 @@
+import Ember from 'ember';
+import layout from '../templates/components/video-test';
+
+import videojs from 'videojs';
+
+export default Ember.Component.extend({
+ layout,
+ tagName: 'video',
+ classNames: ['video-js'],
+ attributeBindings:['data-setup'],
+
+ 'data-setup': Ember.computed(function() {
+ return '{"controls": true, "autoplay": false, "preload": "auto"}';
+ }),
+
+ didInsertElement() {
+ this._super(...arguments);
+ videojs(this.elementId);
+ }
+});
+

tests/dummy/app/styles/app.css

@@ -0,0 +1,3 @@
+.video-js {
+ margin:50px auto;
+}

tests/dummy/app/templates/application.hbs

@@ -1,5 +1 @@
-{{!-- The following component displays Ember's default welcome message. --}}
-{{welcome-page}}
-{{!-- Feel free to remove this! --}}
-
-{{outlet}}
+{{video-test}}

tests/dummy/app/templates/components/video-test.hbs

@@ -0,0 +1,2 @@
+<source src="//vjs.zencdn.net/v/oceans.mp4" type="video/mp4">
+<source src="//vjs.zencdn.net/v/oceans.webm" type="video/webm">