Skip to content

Commit

Permalink
chore: Update using plugin generator v7.2.4 (#52)
Browse files Browse the repository at this point in the history
  • Loading branch information
brandonocasey authored and misteroneill committed Sep 5, 2018
1 parent 050c300 commit 761f547
Show file tree
Hide file tree
Showing 24 changed files with 5,581 additions and 6,750 deletions.
11 changes: 0 additions & 11 deletions .babelrc

This file was deleted.

8 changes: 3 additions & 5 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,9 @@ npm-debug.log*
bower_components/
node_modules/

# Yeoman meta-data
.yo-rc.json

# Build-related directories
dist/
dist-test/
docs/api/
es5/
test/dist/
.eslintcache
.yo-rc.json
1 change: 1 addition & 0 deletions .nvmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
lts/*
29 changes: 10 additions & 19 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,25 +1,16 @@
sudo: false
dist: trusty
language: node_js
node_js:
- 8
cache:
directories:
- node_modules
# node version is specified using the .nvmrc file
before_install:
- npm install -g greenkeeper-lockfile@1
before_script:
# check if the current version is equal to the version for the env
- 'export IS_INSTALLED="$(npm list video.js | grep "video.js@$VJS")"'
# we have to add semi colons to the end of each line in the if
# as travis runs this all on one line
- 'if [ -z "$IS_INSTALLED" ]; then
echo "INSTALLING video.js@>=$VJS.0.0-RC.0 <$(($VJS+1)).0.0";
npm i "video.js@>=$VJS.0.0-RC.0 <\$(($VJS+1)).0.0";
else
echo "video.js@$VJS ALREADY INSTALLED";
fi'
env:
- VJS=5
- VJS=6
- export DISPLAY=:99.0
- sh -e /etc/init.d/xvfb start
- greenkeeper-lockfile-update
after_script:
- greenkeeper-lockfile-upload
addons:
chrome: stable
firefox: latest
chrome: stable

29 changes: 29 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1 +1,30 @@
# CONTRIBUTING

We welcome contributions from everyone!

## Getting Started

Make sure you have Node.js 4.8 or higher and npm installed.

1. Fork this repository and clone your fork
1. Install dependencies: `npm install`
1. Run a development server: `npm start`

### Making Changes

Refer to the [video.js plugin conventions][conventions] for more detail on best practices and tooling for video.js plugin authorship.

When you've made your changes, push your commit(s) to your fork and issue a pull request against the original repository.

### Running Tests

Testing is a crucial part of any software project. For all but the most trivial changes (typos, etc) test cases are expected. Tests are run in actual browsers using [Karma][karma].

- In all available and supported browsers: `npm test`
- In a specific browser: `npm run test:chrome`, `npm run test:firefox`, etc.
- While development server is running (`npm start`), navigate to [`http://localhost:9999/test/`][local]


[karma]: http://karma-runner.github.io/
[local]: http://localhost:9999/test/
[conventions]: https://github.com/videojs/generator-videojs-plugin/blob/master/docs/conventions.md
11 changes: 8 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,12 +1,17 @@
# videojs-contrib-eme [![Build Status](https://travis-ci.org/videojs/videojs-contrib-eme.svg?branch=master)](https://travis-ci.org/videojs/videojs-contrib-eme)
# videojs-contrib-eme


[![Build Status](https://travis-ci.org/videojs/videojs-contrib-eme.svg?branch=master)](https://travis-ci.org/videojs/videojs-contrib-eme)
[![Greenkeeper badge](https://badges.greenkeeper.io/videojs/videojs-contrib-eme.svg)](https://greenkeeper.io/)
[![Slack Status](http://slack.videojs.com/badge.svg)](http://slack.videojs.com)

[![NPM](https://nodei.co/npm/videojs-contrib-eme.png?downloads=true&downloadRank=true)](https://nodei.co/npm/videojs-contrib-eme/)

Supports Encrypted Media Extensions for playback of encrypted content in Video.js

Lead Maintainer: Garrett Singer [@gesinger](https://github.com/gesinger)
Maintenance Status: Experimental

### Table of Contents

<!-- START doctoc generated TOC please keep comment here to allow auto update -->
<!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE -->

Expand Down
13 changes: 0 additions & 13 deletions bower.json

This file was deleted.

6 changes: 1 addition & 5 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -10,18 +10,14 @@
</video>

<ul>
<li><a id="test-page">Run unit tests in browser.</a></li>
<li><a href="/test/debug.html">Run unit tests in browser.</a></li>
</ul>

<script src="/node_modules/video.js/dist/video.js"></script>
<script src="/dist/videojs-contrib-eme.js"></script>

<script>
(function(window, videojs) {
var testPage = document.getElementById('test-page');
testPage.href = window.location.protocol + '//' +
window.location.hostname + ':9876/debug.html';

// Example derived from http://www.html5rocks.com/en/tutorials/eme/basics/#clear-key

const KEY = new Uint8Array([
Expand Down
Loading

0 comments on commit 761f547

Please sign in to comment.