Merge branch 'master' of https://github.com/video-dev/hls.js

README.md

@@ -72,7 +72,7 @@ Find the commit on [https://github.com/video-dev/hls.js/blob/deployments/README.
   });
  }
  // hls.js is not supported on platforms that do not have Media Source Extensions (MSE) enabled.
- // When the browser has built-in HLS support (check using `canPlayType`), we can provide an HLS manifest (i.e. .m3u8 URL) directly to the video element throught the `src` property.
+ // When the browser has built-in HLS support (check using `canPlayType`), we can provide an HLS manifest (i.e. .m3u8 URL) directly to the video element through the `src` property.
  // This is using the built-in support of the plain video element, without using hls.js.
  // Note: it would be more normal to wait on the 'canplay' event below however on Safari (where you are most likely to find built-in HLS support) the video.src URL must be on the user-driven
  // white-list before a 'canplay' event will be emitted; the last video event that can be reliably listened-for when the URL is not on the white-list is 'loadedmetadata'.
@@ -103,6 +103,8 @@ HTMLVideoElement control and events could be used seamlessly.
 |[<img src="https://player.mtvnservices.com/edge/hosted/Viacom_logo.svg" width="120">](https://www.viacom.com/)|[<img src="https://user-images.githubusercontent.com/1181974/29248959-efabc440-802d-11e7-8050-7c1f4ca6c607.png" width="120">](https://vk.com/)|[<img src="https://s3.amazonaws.com/uploads.hipchat.com/87223/4876411/7Rybnl26ReFzlt3/jw-logo-red.png" width="120">](https://www.jwplayer.com)|[<img src="https://staticftv-a.akamaihd.net/arches/francetv/default/img/og-image.jpg?20161007" width="120">](https://www.france.tv)|
 |[<img src="http://showmax.akamaized.net/e/logo/showmax_black.png" width="120">](https://tech.showmax.com)|[<img src="https://static3.1tv.ru/assets/web/logo-ac67852f1625b338f9d1fb96be089d03557d50bfc5790d5f48dc56799f59dec6.svg" width="120" height="120">](https://www.1tv.ru/) | [<img src="https://user-images.githubusercontent.com/1480052/40482633-c013ebce-5f55-11e8-96d5-b776415de0ce.png" width="120">](https://www.zdf.de) | [<img src="https://github.com/cdnbye/hlsjs-p2p-engine/blob/master/figs/cdnbye.png" width="120">](https://github.com/cdnbye/hlsjs-p2p-engine)| |
 |[<img src="https://streaming.cdn77.com/live-streaming-logo-dark.png" width="120">](https://streaming.cdn77.com/)| [<img src="https://avatars0.githubusercontent.com/u/7442371?s=200&v=4" width="120">](https://r7.com/)|[<img src="https://raw.githubusercontent.com/Novage/p2p-media-loader/gh-pages/images/p2pml-logo.png" width="120">](https://github.com/Novage/p2p-media-loader)|[<img src="https://avatars3.githubusercontent.com/u/45617200?s=400" width="120">](https://kayosports.com.au)
+|[<img src="https://user-images.githubusercontent.com/6701211/61649753-b3415600-ac77-11e9-9fbb-90a4d4c61628.png" width="120">](https://flosports.tv)
+
 
 ## Player Integration
 

docs/release-process.md

@@ -1,8 +1,14 @@
 # Performing A Release
 Releases are performed automatically with travis.
 
-1. `git tag -a v<major>.<minor>.<patch>` _('v' required)_
-2. `git push --tag`
-3. Wait for travis to create a new draft GitHub release with the build attached. At this point the new npm package should have been published.
-4. Add the release notes to the new draft GitHub release.
-5. Publish the GitHub release.
+1. `git tag -a v<major>.<minor>.<patch>` or `git tag -a v<major>.<minor>.<patch>-<prerelease>`   _('v' required)_ where anything before the first `.` in `<prerelease>` will be become the [npm dist-tag](https://docs.npmjs.com/cli/dist-tag).
+1. `git push`
+1. `git push --tag`
+1. Wait for travis to create a new draft GitHub release with the build attached. At this point the new npm package should have been published.
+1. Add the release notes to the new draft GitHub release.
+1. Publish the GitHub release.
+
+## Examples
+- `git tag -a v1.2.3` will result in `1.2.3` being published with the `latest` npm tag.
+- `git tag -a v1.2.3-beta` will result in `1.2.3-beta` being published with the `beta` npm tag.
+- `git tag -a v1.2.3-beta.1` will result in `1.2.3-beta.1` being published with the `beta` npm tag.

karma.conf.js

@@ -1,6 +1,3 @@
-// Karma configuration
-// Generated on Tue Jul 18 2017 12:17:16 GMT-0700 (PDT)
-const path = require('path');
 const merge = require('webpack-merge');
 const webpackConfig = require('./webpack.config')({ debug: true })[0];
 delete webpackConfig.entry;
@@ -11,11 +8,11 @@ const mergeConfig = merge(webpackConfig, {
     rules: [
       {
         test: /\.(ts|js)$/,
-        exclude: path.resolve(__dirname, 'node_modules'),
+        exclude: /(node_modules|tests)/,
         enforce: 'post',
         use: [
           {
-            loader: 'coverage-istanbul-loader',
+            loader: 'istanbul-instrumenter-loader',
             options: {
               esModules: true
             }
@@ -34,7 +31,10 @@ module.exports = function (config) {
 
     // list of files / patterns to load in the browser
     // https://github.com/webpack-contrib/karma-webpack#alternative-usage
-    files: ['tests/index.js'],
+    files: [{
+      pattern: 'tests/index.js',
+      watched: false
+    }],
 
     // list of files to exclude
     exclude: [],