browserify-p2: m3u8, stream, and stub

stub old functionality to get unit tests working for now
stub old test functionality to get unit tests working for now
fixed some issues with the first browserify part
convert m3u8 and stream modules to es6/node/browserify
fixed npm scripts to work for current branch

@@ -40,14 +40,17 @@
     </label>
     <button type=submit>Load</button>
   </form>
+  <ul>
+    <li><a href="/test/">Run unit tests in browser.</a></li>
+    <li><a href="/docs/api/">Read generated docs.</a></li>
+  </ul>
 
   <script src="/node_modules/video.js/dist/video.js"></script>
   <script src="/node_modules/videojs-contrib-media-sources/dist/videojs-media-sources.js"></script>
   <script src="/node_modules/pkcs7/dist/pkcs7.unpad.js"></script>
-  <script src="/src/videojs-hls.js"></script>
+  <script src="/src/videojs-contrib-hls.js"></script>
   <script src="/src/xhr.js"></script>
-  <script src="/src/stream.js"></script>
-  <script src="/src/m3u8/m3u8-parser.js"></script>
+  <script src="/dist/videojs-contrib-hls.js"></script>
   <script src="/src/playlist.js"></script>
   <script src="/src/playlist-loader.js"></script>
   <script src="/src/decrypter.js"></script>

@@ -2,7 +2,7 @@
   "name": "videojs-contrib-hls",
   "version": "1.3.5",
   "description": "Play back HLS with video.js, even where it's not natively supported",
-  "main": "es5/videojs-hls.js",
+  "main": "es5/stub.js",
   "engines": {
     "node": ">= 0.10.12"
   },
@@ -13,16 +13,17 @@
   "scripts": {
     "prebuild": "npm run clean",
     "build": "npm-run-all -p build:*",
-    "build:manifest": "node -e \"var b=require('./scripts/manifest-data.js'); b.build();\"",
     "build:js": "npm-run-all build:js:babel build:js:browserify build:js:bannerize build:js:uglify",
     "build:js:babel": "babel src -d es5",
     "build:js:bannerize": "bannerize dist/videojs-contrib-hls.js --banner=scripts/banner.ejs",
-    "build:js:browserify": "browserify . -s src/videojs-hls.js -o dist/videojs-contrib-hls.js",
+    "build:js:browserify": "browserify . -s videojs-contrib-hls -o dist/videojs-contrib-hls.js",
     "build:js:uglify": "uglifyjs dist/videojs-contrib-hls.js --comments --mangle --compress -o dist/videojs-contrib-hls.min.js",
-    "build:test": "node scripts/build-test.js",
-    "clean": "npm-run-all clean:*",
+    "build:test": "npm-run-all build:test:manifest build:test:js",
+    "build:test:js": "node scripts/build-test.js",
+    "build:test:manifest": "node -e \"var b=require('./scripts/manifest-data.js'); b.build();\"",
+    "clean": "npm-run-all -p clean:*",
     "clean:build": "node -e \"var s=require('shelljs'),d=['dist','dist-test','es5'];s.rm('-rf',d);s.mkdir('-p',d);\"",
-    "clean:manifest": "node -e \"var b=require('./scripts/manifest-data.js'); b.clean();\"",
+    "clean:test": "node -e \"var b=require('./scripts/manifest-data.js'); b.clean();\"",
     "docs": "npm-run-all docs:*",
     "docs:api": "jsdoc src -r -d docs/api",
     "docs:toc": "doctoc README.md",
@@ -39,9 +40,10 @@
     "preversion": "npm test",
     "version": "npm run build",
     "watch": "npm-run-all -p watch:*",
-    "watch:manifest": "node -e \"var b=require('./scripts/manifest-data.js'); b.watch();\"",
-    "watch:js": "watchify src/videojs-hls.js -t babelify -v -o dist/videojs-contrib-hls.js",
-    "watch:test": "node scripts/watch-test.js",
+    "watch:js": "watchify src/stub.js -t babelify -v -o dist/videojs-contrib-hls.js",
+    "watch:test": "npm-run-all -p watch:test:*",
+    "watch:test:js": "node scripts/watch-test.js",
+    "watch:test:manifest": "node -e \"var b=require('./scripts/manifest-data.js'); b.watch();\"",
     "prepublish": "npm run build"
   },
   "keywords": [

@@ -2,7 +2,7 @@ var browserify = require('browserify');
 var fs = require('fs');
 var glob = require('glob');
 
-glob('test/**/*.test.js', function(err, files) {
+glob('test/{m3u8,stub}.test.js', function(err, files) {
   browserify(files)
     .transform('babelify')
     .bundle()

@@ -9,8 +9,8 @@ var expectedFilepath = testDataDir + '/expected.js';
 
 
 var build = function() {
-  var manifests = 'window.manifests = {\n';
-  var expected = 'window.expected = {\n';
+  var manifests = 'export default {\n';
+  var expected = 'export default {\n';
 
   var files = fs.readdirSync(manifestDir);
   while (files.length > 0) {

@@ -3,7 +3,7 @@ var fs = require('fs');
 var glob = require('glob');
 var watchify = require('watchify');
 
-glob('test/**/*.test.js', function(err, files) {
+glob('test/{m3u8,stub}.test.js', function(err, files) {
   var b = browserify(files, {
     cache: {},
     packageCache: {},

-{
-  "curly": true,
-  "eqeqeq": true,
-  "globals": {
-    "console": true
-  },
-  "immed": true,
-  "latedef": true,
-  "newcap": true,
-  "noarg": true,
-  "sub": true,
-  "undef": true,
-  "unused": true,
-  "boss": true,
-  "eqnull": true,
-  "browser": true
-}

@@ -2,73 +2,84 @@
  * A lightweight readable stream implemention that handles event dispatching.
  * Objects that inherit from streams should call init in their constructors.
  */
-(function(videojs, undefined) {
-  var Stream = function() {
-    this.init = function() {
-      var listeners = {};
-      /**
-       * Add a listener for a specified event type.
-       * @param type {string} the event name
-       * @param listener {function} the callback to be invoked when an event of
-       * the specified type occurs
-       */
-      this.on = function(type, listener) {
-        if (!listeners[type]) {
-          listeners[type] = [];
-        }
-        listeners[type].push(listener);
-      };
-      /**
-       * Remove a listener for a specified event type.
-       * @param type {string} the event name
-       * @param listener {function} a function previously registered for this
-       * type of event through `on`
-       */
-      this.off = function(type, listener) {
-        var index;
-        if (!listeners[type]) {
-          return false;
-        }
-        index = listeners[type].indexOf(listener);
-        listeners[type].splice(index, 1);
-        return index > -1;
-      };
-      /**
-       * Trigger an event of the specified type on this stream. Any additional
-       * arguments to this function are passed as parameters to event listeners.
-       * @param type {string} the event name
-       */
-      this.trigger = function(type) {
-        var callbacks, i, length, args;
-        callbacks = listeners[type];
-        if (!callbacks) {
-          return;
-        }
-        // Slicing the arguments on every invocation of this method
-        // can add a significant amount of overhead. Avoid the
-        // intermediate object creation for the common case of a
-        // single callback argument
-        if (arguments.length === 2) {
-          length = callbacks.length;
-          for (i = 0; i < length; ++i) {
-            callbacks[i].call(this, arguments[1]);
-          }
-        } else {
-          args = Array.prototype.slice.call(arguments, 1);
-          length = callbacks.length;
-          for (i = 0; i < length; ++i) {
-            callbacks[i].apply(this, args);
-          }
-        }
-      };
-      /**
-       * Destroys the stream and cleans up.
-       */
-      this.dispose = function() {
-        listeners = {};
-      };
-    };
-  };
+export default class Stream {
+  constructor() {
+    this.init();
+  }
+
+  init() {
+    this.listeners = {};
+  }
+
+  /**
+   * Add a listener for a specified event type.
+   * @param type {string} the event name
+   * @param listener {function} the callback to be invoked when an event of
+   * the specified type occurs
+   */
+  on(type, listener) {
+    if (!this.listeners[type]) {
+      this.listeners[type] = [];
+    }
+    this.listeners[type].push(listener);
+  }
+
+  /**
+   * Remove a listener for a specified event type.
+   * @param type {string} the event name
+   * @param listener {function} a function previously registered for this
+   * type of event through `on`
+   */
+  off(type, listener) {
+    let index;
+
+    if (!this.listeners[type]) {
+      return false;
+    }
+    index = this.listeners[type].indexOf(listener);
+    this.listeners[type].splice(index, 1);
+    return index > -1;
+  }
+
+  /**
+   * Trigger an event of the specified type on this stream. Any additional
+   * arguments to this function are passed as parameters to event listeners.
+   * @param type {string} the event name
+   */
+  trigger(type) {
+    let callbacks;
+    let i;
+    let length;
+    let args;
+
+    callbacks = this.listeners[type];
+    if (!callbacks) {
+      return;
+    }
+    // Slicing the arguments on every invocation of this method
+    // can add a significant amount of overhead. Avoid the
+    // intermediate object creation for the common case of a
+    // single callback argument
+    if (arguments.length === 2) {
+      length = callbacks.length;
+      for (i = 0; i < length; ++i) {
+        callbacks[i].call(this, arguments[1]);
+      }
+    } else {
+      args = Array.prototype.slice.call(arguments, 1);
+      length = callbacks.length;
+      for (i = 0; i < length; ++i) {
+        callbacks[i].apply(this, args);
+      }
+    }
+  }
+
+  /**
+   * Destroys the stream and cleans up.
+   */
+  dispose() {
+    this.listeners = {};
+  }
   /**
    * Forwards all `data` events on this stream to the destination stream. The
    * destination stream should provide a method `push` to receive the data
@@ -76,11 +87,9 @@
    * @param destination {stream} the stream that will receive all `data` events
    * @see http://nodejs.org/api/stream.html#stream_readable_pipe_destination_options
    */
-  Stream.prototype.pipe = function(destination) {
+  pipe(destination) {
     this.on('data', function(data) {
       destination.push(data);
     });
-  };
-
-  videojs.Hls.Stream = Stream;
-})(window.videojs);
+  }
+}

+import m3u8 from './m3u8';
+import Stream from './Stream';
+import videojs from 'video.js';
+
+if(typeof window.videojs.Hls === 'undefined') {
+  videojs.Hls = {};
+}
+videojs.Hls.Stream = Stream;
+videojs.m3u8 = m3u8;
+

@@ -16,22 +16,16 @@
   <script src="/node_modules/video.js/dist/video.js"></script>
   <script src="/node_modules/videojs-contrib-media-sources/src/videojs-media-sources.js"></script>
 
-  <script src="/src/videojs-hls.js"></script>
+  <script src="/src/videojs-contrib-hls.js"></script>
   <script src="/src/xhr.js"></script>
-  <script src="/src/stream.js"></script>
-  <script src="/src/m3u8/m3u8-parser.js"></script>
+  <script src="/dist/videojs-contrib-hls.js"></script>
   <script src="/src/playlist.js"></script>
   <script src="/src/playlist-loader.js"></script>
   <script src="/src/decrypter.js"></script>
   <script src="/src/bin-utils.js"></script>
 
-  <script src="/test/data/manifests.js"></script>
-  <script src="/test/data/expected.js"></script>
-  <script src="/test/data/ts-segment-bc.js"></script>
-
-
-  <script src="/test/videojs-hls.test.js"></script>
-  <script src="/test/m3u8.test.js"></script>
+  <script src="/test/videojs-contrib-hls.test.js"></script>
+  <script src="/dist-test/videojs-contrib-hls.js"></script>
   <script src="/test/playlist.test.js"></script>
   <script src="/test/playlist-loader.test.js"></script>
   <script src="/test/decrypter.test.js"></script>

@@ -2,8 +2,7 @@ var merge = require('lodash-compat/object/merge');
 
 var DEFAULTS = {
   basePath: '../..',
-  //frameworks: ['browserify', 'qunit'],
-  frameworks: ['qunit'],
+  frameworks: ['browserify', 'qunit'],
 
 
   files: [
@@ -16,20 +15,19 @@ var DEFAULTS = {
     'node_modules/pkcs7/dist/pkcs7.unpad.js',
     'node_modules/videojs-contrib-media-sources/src/videojs-media-sources.js',
 
-    'src/videojs-hls.js',
+    // these two stub old functionality
+    'src/videojs-contrib-hls.js',
     'src/xhr.js',
-    'src/stream.js',
-    'src/m3u8/m3u8-parser.js',
+    'dist/videojs-contrib-hls.js',
+
     'src/playlist.js',
     'src/playlist-loader.js',
     'src/decrypter.js',
     'src/bin-utils.js',
 
-    'test/data/manifests.js',
-    'test/data/expected.js',
-    'test/data/ts-segment-bc.js',
+    'test/stub.test.js',
 
-    'test/videojs-hls.test.js',
+    'test/videojs-contrib-hls.test.js',
     'test/m3u8.test.js',
     'test/playlist.test.js',
     'test/playlist-loader.test.js',
@@ -44,12 +42,12 @@ var DEFAULTS = {
   ],
 
   plugins: [
-  //  'karma-browserify',
+    'karma-browserify',
     'karma-qunit'
   ],
 
   preprocessors: {
-   // 'test/**/*.js': ['browserify']
+    'test/{stub,m3u8}.test.js': ['browserify']
   },
 
   reporters: ['dots'],
@@ -59,18 +57,16 @@ var DEFAULTS = {
   singleRun: true,
   concurrency: Infinity,
 
-  /*
   browserify: {
     debug: true,
     transform: [
       'babelify',
       'browserify-shim'
     ],
-    noparse: [
+    noParse: [
       'test/data/**',
     ]
   }
-  */
 };
 
 /**

@@ -29,6 +29,7 @@ module.exports = function(config) {
         postDetection: function(availableBrowsers) {
           var safariIndex = availableBrowsers.indexOf('Safari');
           if(safariIndex !== -1) {
+            console.log("Not running safari it is/was broken");
             availableBrowsers.splice(safariIndex, 1);
           }
           return availableBrowsers;

+import manifests from './data/manifests';
+import expected from './data/expected';
+window.manifests = manifests;
+window.expected = expected;
+