diff --git a/package.json b/package.json
index 0571d983..38a4f5eb 100644
--- a/package.json
+++ b/package.json
@@ -24,18 +24,16 @@
   "main": "./dist/cld-video-player.js",
   "style": "./dist/cld-video-player.css",
   "dependencies": {
-    "expose-loader": "^0.7.4",
+    "expose-loader": "^0.7.5",
     "fetch-ponyfill": "^4.0.0",
     "get-size": "^2.0.2",
     "optimize-css-assets-webpack-plugin": "^3.2.0",
     "promise-polyfill": "^6.0.2",
-    "video.js": "^6.9.0",
+    "video.js": "^7.4.1",
     "videojs-contextmenu": "^1.2.2",
-    "videojs-contrib-ads": "^6.2.0",
-    "videojs-contrib-hls": "^5.14.1",
-    "videojs-contrib-media-sources": "^4.4.2",
+    "videojs-contrib-ads": "^6.6.1",
     "videojs-ima": "^1.5.1",
-    "videojs-per-source-behaviors": "^1.1.3",
+    "videojs-per-source-behaviors": "^2.1.0",
     "webfontloader": "^1.6.28",
     "webpack-bundle-analyzer": "^2.9.1",
     "webpack-conditional-loader": "^1.0.11",
@@ -81,7 +79,7 @@
     "uglify-js": "^3.4.7",
     "uglifyjs-webpack-plugin": "^1.3.0",
     "url-loader": "^0.5.7",
-    "webpack": "^2.2.1",
+    "webpack": "^2.7.0",
     "webpack-dev-server": "^2.3.0",
     "webpack-merge": "^2.6.1",
     "webpack-shell-plugin": "^0.5.0"
diff --git a/src/plugins/ima/index.js b/src/plugins/ima/index.js
index 90ded75e..00afb134 100644
--- a/src/plugins/ima/index.js
+++ b/src/plugins/ima/index.js
@@ -20,7 +20,7 @@
 
 (function(factory) {
   if (typeof define === 'function' && define['amd']) {
-    define(['video.js', 'videojs-contrib-ads'], function(videojs){ factory(window, document, videojs) });
+    define(['video.js', 'videojs-contrib-ads'], function(videojs){ factory(window, document, videojs.default) });
   } else if (typeof exports === 'object' && typeof module === 'object') {
     var vjs = require('video.js');
     require('videojs-contrib-ads');
diff --git a/src/plugins/index.js b/src/plugins/index.js
index 92611f24..17f509fe 100644
--- a/src/plugins/index.js
+++ b/src/plugins/index.js
@@ -1,7 +1,6 @@
 // #if (!process.env.WEBPACK_BUILD_LIGHT)
 import 'videojs-contrib-ads';
 import './ima';
-import 'videojs-contrib-hls';
 // #endif
 import 'videojs-per-source-behaviors';
 import autoplayOnScroll from './autoplay-on-scroll';
diff --git a/src/video-player.js b/src/video-player.js
index a1c18342..9ea1eb1a 100644
--- a/src/video-player.js
+++ b/src/video-player.js
@@ -40,6 +40,7 @@ Object.keys(plugins).forEach((key) => {
   videojs.registerPlugin(key, plugins[key]);
 });
 
+
 const normalizeAutoplay = (options) => {
   const autoplayMode = options.autoplayMode;
   if (autoplayMode) {
diff --git a/static/examples/adaptive-streaming.html b/static/examples/adaptive-streaming.html
index d6874bff..c52c9f2f 100644
--- a/static/examples/adaptive-streaming.html
+++ b/static/examples/adaptive-streaming.html
@@ -110,8 +110,8 @@ <h3 class="text-primary mt-5">Example Code:</h3>
   <!-- Cloudinary Video Player Dependencies -->
   <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/cloudinary-core/2.3.0/cloudinary-core-shrinkwrap.js"></script>
   <script type="text/javascript" src="/cld-video-player.js"></script>
-  <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/dashjs/2.6.3/dash.all.min.js"></script>
-  <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/videojs-contrib-dash/2.9.2/videojs-dash.min.js"></script>
+    <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/dashjs/2.9.2/dash.all.min.js"></script>
+    <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/videojs-contrib-dash/2.10.0/videojs-dash.min.js"></script>
 
   <!-- Actual code -->
   <script type="text/javascript">
diff --git a/static/examples/components.html b/static/examples/components.html
index 7f0d3d4a..753ea3f0 100644
--- a/static/examples/components.html
+++ b/static/examples/components.html
@@ -232,10 +232,10 @@ <h3 class="text-primary mt-5 mb-5">Example Code:</h3>
     // ===============================================
 
     // Get the ClickableComponent base class from Video.js
-    var ClickableComponent = videojs.getComponent('ClickableComponent');
+    var ClickableComponent = videojs.default.getComponent('ClickableComponent');
 
     // Create a common class for playlist buttons
-    var PlaylistButton = videojs.extend(ClickableComponent, {
+    var PlaylistButton = videojs.default.extend(ClickableComponent, {
       constructor: function(player, options) {
         var type = options.type;
         if (!type && type != 'previous' && type != 'next') {
@@ -253,7 +253,7 @@ <h3 class="text-primary mt-5 mb-5">Example Code:</h3>
       createEl: function() {
         var typeCssClass = 'vjs-playlist-' + this.type + '-control';
 
-        return videojs.createEl('button', {
+        return videojs.default.createEl('button', {
 
           // Prefixing classes of elements within a player with "vjs-"
           // is a convention used in Video.js.
@@ -263,7 +263,7 @@ <h3 class="text-primary mt-5 mb-5">Example Code:</h3>
     });
 
     // Create the NextButton component
-    var NextButton = videojs.extend(PlaylistButton, {
+    var NextButton = videojs.default.extend(PlaylistButton, {
       constructor: function(player, options) {
         PlaylistButton.apply(this, [player, { type: 'next' }]);
       },
@@ -278,7 +278,7 @@ <h3 class="text-primary mt-5 mb-5">Example Code:</h3>
     });
 
     // Create the PreviousButton component
-    var PreviousButton = videojs.extend(PlaylistButton, {
+    var PreviousButton = videojs.default.extend(PlaylistButton, {
       constructor: function(player, options) {
         PlaylistButton.apply(this, [player, { type: 'previous' }]);
       },
@@ -290,8 +290,8 @@ <h3 class="text-primary mt-5 mb-5">Example Code:</h3>
     });
 
     // Register the component with Video.js, so it can be used in players.
-    videojs.registerComponent('NextButton', NextButton);
-    videojs.registerComponent('PreviousButton', PreviousButton);
+    videojs.default.registerComponent('NextButton', NextButton);
+    videojs.default.registerComponent('PreviousButton', PreviousButton);
 
     // Cloudinary Video Player related code
     // ====================================
diff --git a/test/analytics.test.js b/test/analytics.test.js
index bdbaffb5..3a3fdfdb 100644
--- a/test/analytics.test.js
+++ b/test/analytics.test.js
@@ -8,11 +8,10 @@ describe('Analytics tests', () => {
     // parameter Interceptor
     paramInterceptor = new RequestInterceptor((testee, keyword) => {
       let urlObj = new URL(testee);
-      console.log(urlObj.searchParams);
       return urlObj.searchParams.get('ea') === keyword;
-    }, console);
+    });
     await page.setRequestInterception(true);
-    await page.setViewport({ width: 1280, height: 800 });
+    await page.setViewport({ width: 1280, height: 1800 });
   }, 35000);
   it('Analytics requests', async () => {
     jest.setTimeout(35000);
@@ -53,17 +52,16 @@ describe('Analytics tests', () => {
     await page.on('request', paramInterceptor.intercept.bind(paramInterceptor));
     await page.goto('http://localhost:3000/analytics.html', { waitUntil: 'load' });
     await page.waitFor(1000);
-    await page.click('#example-player > div.vjs-control-bar > div.vjs-volume-panel.vjs-control.vjs-volume-panel-horizontal > button');
+    await page.click('#example-player > .vjs-control-bar > .vjs-volume-panel.vjs-control.vjs-volume-panel-horizontal > button');
     expect(spy.hasMatch()).toBe(true);
   });
   it('Test percentage event', async () => {
     jest.setTimeout(60000);
     let fussyParamInterceptor = new RequestInterceptor((testee, keyword) => {
       let urlObj = new URL(testee);
-      console.log(urlObj.searchParams);
       let event = urlObj.searchParams.get('ea');
       return event !== null && event.includes(keyword);
-    }, console);
+    });
     let spy = new RequestSpy('Percents Played');
     fussyParamInterceptor.addSpy(spy);
     await page.on('request', fussyParamInterceptor.intercept.bind(fussyParamInterceptor));
@@ -76,10 +74,9 @@ describe('Analytics tests', () => {
     jest.setTimeout(35000);
     let fussyParamInterceptor = new RequestInterceptor((testee, keyword) => {
       let urlObj = new URL(testee);
-      console.log(urlObj.searchParams);
       let event = urlObj.searchParams.get('ea');
       return event !== null && event.includes(keyword);
-    }, console);
+    });
     let spy = new RequestSpy('Seek');
     fussyParamInterceptor.addSpy(spy);
     await page.on('request', fussyParamInterceptor.intercept.bind(fussyParamInterceptor));
@@ -96,7 +93,7 @@ describe('Analytics tests', () => {
     await page.on('request', paramInterceptor.intercept.bind(paramInterceptor));
     await page.goto('http://localhost:3000/analytics.html', { waitUntil: 'load' });
     await page.waitFor(1000);
-    await page.click('#example-player > div.vjs-control-bar > button.vjs-fullscreen-control.vjs-control.vjs-button');
+    await page.click('#example-player > .vjs-control-bar > button.vjs-fullscreen-control.vjs-control.vjs-button');
     await page.waitFor(500);
     expect(spy.hasMatch()).toBe(true);
   });
diff --git a/test/api.test.js b/test/api.test.js
index fa2a8435..73870fd8 100644
--- a/test/api.test.js
+++ b/test/api.test.js
@@ -1,6 +1,6 @@
 describe('API player tests', () => {
   beforeEach(async () => {
-    await page.setViewport({width: 1280, height: 800});
+    await page.setViewport({width: 1280, height: 1800});
     await page.goto('http://localhost:3000/api.html', {waitUntil: 'load'});
     await page.evaluate(() => {
       Object.defineProperty(HTMLMediaElement.prototype, 'playing', {
@@ -14,20 +14,20 @@ describe('API player tests', () => {
   it('Test forward 10 seconds', async () => {
     await page.click('#example-player > div.vjs-control-bar > button.vjs-play-control.vjs-control');
     await page.waitFor(500);
-    let time = await page.$eval('#example-player > div.vjs-control-bar > div.vjs-current-time.vjs-time-control.vjs-control > div.vjs-current-time-display', vt => Number(vt.textContent.replace('0:', '')));
+    let time = await page.$eval('#example-player > .vjs-control-bar > .vjs-current-time.vjs-time-control.vjs-control > .vjs-current-time-display', vt => Number(vt.textContent.replace('0:', '')));
     await page.click('#vid-seek-plus');
     await page.waitFor(500);
-    let newtime = await page.$eval('#example-player > div.vjs-control-bar > div.vjs-current-time.vjs-time-control.vjs-control > div.vjs-current-time-display', vt => Number(vt.textContent.replace('0:', '')));
+    let newtime = await page.$eval('#example-player > .vjs-control-bar > .vjs-current-time.vjs-time-control.vjs-control > .vjs-current-time-display', vt => Number(vt.textContent.replace('0:', '')));
     expect(newtime).toEqual(time + 10);
   });
   it('Test back 10 seconds', async () => {
-    await page.click('#example-player > div.vjs-control-bar > button.vjs-play-control.vjs-control');
+    await page.click('#example-player > .vjs-control-bar > button.vjs-play-control.vjs-control');
     await page.waitFor(500);
     await page.click('#vid-seek-plus');
     await page.waitFor(500);
     await page.click('#vid-seek-minus');
     await page.waitFor(500);
-    let newtime = await page.$eval('#example-player > div.vjs-control-bar > div.vjs-current-time.vjs-time-control.vjs-control > div.vjs-current-time-display', vt => Number(vt.textContent.replace('0:', '')));
+    let newtime = await page.$eval('#example-player > .vjs-control-bar > .vjs-current-time.vjs-time-control.vjs-control > .vjs-current-time-display', vt => Number(vt.textContent.replace('0:', '')));
     expect(newtime).toEqual(0);
   });
   it('Test mute un-mute', async () => {
@@ -41,17 +41,21 @@ describe('API player tests', () => {
   });
   it('Test volume down', async () => {
     await page.waitFor(500);
-    let currentVol = await page.$$eval('#example-player_html5_api', v => v.volume);
+    await page.click('#vid-unmute');
+    await page.waitFor(500);
+    let currentVol = await page.$eval('#example-player_html5_api', v => v.volume);
     await page.click('#vid-volume-minus');
     await page.waitFor(500);
-    expect(await page.$$eval('#example-player_html5_api', v => v.volume)).toBe(currentVol - 0.1);
+    expect(await page.$eval('#example-player_html5_api', v => v.volume)).toBe(currentVol - 0.1);
   });
   it('Test volume up', async () => {
     await page.waitFor(500);
-    let currentVol = await page.$$eval('#example-player_html5_api', v => v.volume);
+    await page.click('#vid-unmute');
+    await page.waitFor(500);
+    let currentVol = await page.$eval('#example-player_html5_api', v => v.volume);
     await page.click('#vid-volume-plus');
     await page.waitFor(500);
-    expect(await page.$$eval('#example-player_html5_api', v => v.volume)).toBe(currentVol + 0.1);
+    expect(await page.$eval('#example-player_html5_api', v => v.volume)).toBe(currentVol + 0.1);
   });
   it('Test pause', async () => {
     await page.waitFor(500);
@@ -61,7 +65,7 @@ describe('API player tests', () => {
   });
   it('Test play', async () => {
     await page.waitFor(500);
-    await page.click('#example-player > div.vjs-control-bar > button.vjs-play-control.vjs-control');
+    await page.click('#example-player > .vjs-control-bar > button.vjs-play-control.vjs-control');
     await page.waitFor(500);
     expect(await page.$eval('#example-player video', el => el.playing)).toBe(false);
     await page.waitFor(500);
@@ -76,10 +80,10 @@ describe('API player tests', () => {
   });
   it('Test hide controls', async () => {
     await page.waitFor(500);
-    expect(await page.$eval('#example-player > div.vjs-control-bar', p => p.offsetWidth)).toBeGreaterThan(0);
+    expect(await page.$eval('#example-player > .vjs-control-bar', p => p.offsetWidth)).toBeGreaterThan(0);
     await page.click('#vid-toggle-controls');
     await page.waitFor(500);
-    expect(await page.$eval('#example-player > div.vjs-control-bar', p => p.offsetWidth)).toBe(0);
+    expect(await page.$eval('#example-player > .vjs-control-bar', p => p.offsetWidth)).toBe(0);
   });
   it('Test fullscreen', async () => {
     await page.waitFor(500);
diff --git a/test/basic-ui.test.js b/test/basic-ui.test.js
index 3b6b878f..477f13ea 100644
--- a/test/basic-ui.test.js
+++ b/test/basic-ui.test.js
@@ -38,7 +38,7 @@ describe('basic player tests', () => {
     await page.waitFor(500);
     let playing = await page.$eval('#example-player video', el => el.playing);
     await expect(playing).toBe(true);
-    await page.click('#example-player > div.vjs-control-bar > button.vjs-play-control.vjs-control');
+    await page.click('#example-player > .vjs-control-bar > button.vjs-play-control.vjs-control');
     await page.waitFor(500);
     playing = await page.$eval('#example-player video', el => el.playing);
     await expect(playing).toBe(false);
@@ -48,15 +48,15 @@ describe('basic player tests', () => {
     await page.click('#example-player > button.vjs-big-play-button');
     await page.waitFor(500);
     expect(await page.$eval('#example-player video', v => v.muted)).toBe(true);
-    await page.click('#example-player > div.vjs-control-bar > div.vjs-volume-panel.vjs-control.vjs-volume-panel-horizontal > button');
+    await page.click('#example-player > .vjs-control-bar > .vjs-volume-panel.vjs-control.vjs-volume-panel-horizontal > button');
     expect(await page.$eval('#example-player video', v => v.muted)).toBe(false);
   });
   it('Test video time', async () => {
     await page.waitForSelector('.vjs-big-play-button');
     await page.click('#example-player > button.vjs-big-play-button');
     await page.waitFor(2000);
-    let time = await page.$eval('#example-player > div.vjs-control-bar > div.vjs-current-time.vjs-time-control.vjs-control > div.vjs-current-time-display', vt => Number(vt.textContent.replace(':', '')));
+    let time = await page.$eval('#example-player > .vjs-control-bar > .vjs-current-time.vjs-time-control.vjs-control > .vjs-current-time-display', vt => Number(vt.textContent.replace(':', '')));
     await page.waitFor(2000);
-    expect(await page.$eval('#example-player > div.vjs-control-bar > div.vjs-current-time.vjs-time-control.vjs-control > div.vjs-current-time-display', vt => Number(vt.textContent.replace(':', '')))).toBeGreaterThan(time);
+    expect(await page.$eval('#example-player > .vjs-control-bar > .vjs-current-time.vjs-time-control.vjs-control > .vjs-current-time-display', vt => Number(vt.textContent.replace(':', '')))).toBeGreaterThan(time);
   });
 });
\ No newline at end of file
diff --git a/test/multiplayer.test.js b/test/multiplayer.test.js
index fdee8e27..384cc44d 100644
--- a/test/multiplayer.test.js
+++ b/test/multiplayer.test.js
@@ -1,6 +1,6 @@
 describe('Multi-player tests', () => {
   beforeEach(async () => {
-    await page.setViewport({width: 1280, height: 800});
+    await page.setViewport({ width: 1280, height: 1800 });
     await page.goto('http://localhost:3000/multiple-players.html', { waitUntil: 'load' });
     await page.evaluate(() => {
       Object.defineProperty(HTMLMediaElement.prototype, 'playing', {
@@ -13,9 +13,10 @@ describe('Multi-player tests', () => {
   }, 10000);
   it('Test play', async () => {
     page.waitFor(1500);
-    const ids = ['#vjs_video_3_html5_api', '#vjs_video_626_html5_api', '#vjs_video_1140_html5_api'];
-    for (const id of ids) {
-      page.waitFor(1000);
+    const players = await page.$$eval('video', v => v);
+    for (const player of players) {
+      let id = '#' + player.playerId + '_html5_api';
+      await page.waitFor(1500);
       expect(await page.$eval(id, el => el.playing)).toBe(true);
     }
   });
diff --git a/test/playlist.test.js b/test/playlist.test.js
index ef54d16b..2e22c6f7 100644
--- a/test/playlist.test.js
+++ b/test/playlist.test.js
@@ -10,7 +10,7 @@ describe('Playlist tests', () => {
         }
       });
     });
-  }, 10000);
+  }, 30000);
 
   it('Test playlist layout', async () => {
     await page.waitForSelector('#example-player_html5_api', { visible: true, timeout: 35000 });
diff --git a/test/recommendations.test.js b/test/recommendations.test.js
index b7870e32..f1cbb745 100644
--- a/test/recommendations.test.js
+++ b/test/recommendations.test.js
@@ -1,6 +1,6 @@
 describe('Recommendations tests', () => {
   beforeEach(async () => {
-    await page.setViewport({width: 1280, height: 800});
+    await page.setViewport({width: 1280, height: 1800});
     await page.goto('http://localhost:3000/recommendations.html', {waitUntil: 'load'});
     await page.evaluate(() => {
       Object.defineProperty(HTMLMediaElement.prototype, 'playing', {
@@ -25,7 +25,7 @@ describe('Recommendations tests', () => {
     await page.waitFor(1000);
     await page.evaluate((dur) => player.currentTime(dur), duration - 1);
     await page.waitFor('.vjs-recommendations-overlay', {visible: true});
-    await page.click('#example-player > div.vjs-recommendations-overlay > div > div > div.vjs-recommendations-overlay-item.vjs-recommendations-overlay-item-primary > div.vjs-recommendations-overlay-item-primary-image');
+    await page.click('#example-player > div.vjs-recommendations-overlay > div > div > .vjs-recommendations-overlay-item.vjs-recommendations-overlay-item-primary > .vjs-recommendations-overlay-item-primary-image');
     await page.waitFor(1000);
     let recSourceUrl = await page.evaluate(() => player.currentSourceUrl());
     expect(currentSrcUrl).not.toEqual(recSourceUrl);
diff --git a/test/title-bar.test.js b/test/title-bar.test.js
index 33901730..9d339ec8 100644
--- a/test/title-bar.test.js
+++ b/test/title-bar.test.js
@@ -14,12 +14,12 @@ describe('basic player tests', () => {
   }, 10000);
   it('Test title bar title', async () => {
     let ds = JSON.parse(await page.$eval('#example-player', v => v.getAttribute('data-cld-source')));
-    let titlebarTitle = await page.$eval('#example-player > div.vjs-title-bar > div.vjs-title-bar-title', t => t.textContent);
+    let titlebarTitle = await page.$eval('#example-player > .vjs-title-bar > .vjs-title-bar-title', t => t.textContent);
     await expect(ds.info.title).toEqual(titlebarTitle);
   });
   it('Test title bar subtitle', async () => {
     let ds = JSON.parse(await page.$eval('#example-player', v => v.getAttribute('data-cld-source')));
-    let sub = await page.$eval('#example-player > div.vjs-title-bar > div.vjs-title-bar-subtitle', t => t.textContent);
+    let sub = await page.$eval('#example-player > .vjs-title-bar > .vjs-title-bar-subtitle', t => t.textContent);
     await expect(ds.info.subtitle).toEqual(sub);
   });
 
diff --git a/webpack/common.config.js b/webpack/common.config.js
index ec131411..a302e118 100644
--- a/webpack/common.config.js
+++ b/webpack/common.config.js
@@ -39,10 +39,8 @@ module.exports = {
     alias: {
       'video.js': path.resolve(__dirname, '../node_modules/video.js'),
       'webworkify': 'webworkify-webpack2',
-      'videojs-contrib-media-sources$': path.resolve(__dirname, '../node_modules/videojs-contrib-media-sources'),
       'videojs-contrib-ads': path.resolve(__dirname, '../node_modules/videojs-contrib-ads/dist/videojs-contrib-ads.min.js'),
-      'videojs-ima': path.resolve(__dirname, '../node_modules/videojs-ima/dist/videojs-ima.min.js'),
-      'videojs-contrib-hls': path.resolve(__dirname, '../node_modules/videojs-contrib-hls/dist/videojs-contrib-hls.min.js')
+      'videojs-ima': path.resolve(__dirname, '../node_modules/videojs-ima/dist/videojs-ima.min.js')
     }
   },
 
@@ -106,8 +104,13 @@ module.exports = {
         use: 'url-loader?limit=10000'
       },
       {
-        test: require.resolve('video.js'),
-        use: 'expose-loader?videojs'
+        test: path.resolve(__dirname, '../node_modules/video.js'),
+        use: [
+          {
+            loader: 'expose-loader',
+            options: 'videojs'
+          }
+        ]
       }
     ]
   },
diff --git a/yarn.lock b/yarn.lock
index 6fa4e0ef..41f7f7ec 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -521,6 +521,13 @@
     js-levenshtein "^1.1.3"
     semver "^5.3.0"
 
+"@babel/runtime@^7.0.0", "@babel/runtime@^7.2.0":
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.2.0.tgz#b03e42eeddf5898e00646e4c840fa07ba8dcad7f"
+  integrity sha512-oouEibCbHMVdZSDlJBO6bZmID/zA/G/Qx3H1d3rSNPTD+L8UNKvCat7aKWSJ74zYbm5zWGh0GQN0hKj8zYFTCg==
+  dependencies:
+    regenerator-runtime "^0.12.0"
+
 "@babel/template@^7.1.0":
   version "7.1.0"
   resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.1.0.tgz#58cc9572e1bfe24fe1537fdf99d839d53e517e22"
@@ -554,6 +561,32 @@
     lodash "^4.17.10"
     to-fast-properties "^2.0.0"
 
+"@videojs/http-streaming@1.4.1":
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/@videojs/http-streaming/-/http-streaming-1.4.1.tgz#0b9c5d1a271d72546ec77e9c3f3b75995102032f"
+  integrity sha512-Bb3aP/b81heFt98JzDm8zN+mkHel8Ehb/ZKAOECeL19zq/Gp12653cE4JmG7cUI6VPSQB60DYMp6us3/HqKs7Q==
+  dependencies:
+    aes-decrypter "3.0.0"
+    global "^4.3.0"
+    m3u8-parser "4.2.0"
+    mpd-parser "0.7.0"
+    mux.js "4.5.1"
+    url-toolkit "^2.1.3"
+    video.js "^6.8.0 || ^7.0.0"
+
+"@videojs/http-streaming@1.5.1":
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/@videojs/http-streaming/-/http-streaming-1.5.1.tgz#b6c81ec1f1ec93ee57c261f34c144f5493c9fc31"
+  integrity sha512-Pc3aVr4SRINFLhUWjTofVjQ9iMjs9myXnyfJ0AdW0c4bLwJ0Fw7HUsbns+qseuBzVJe01i7J2R/DE1Y4hFgblA==
+  dependencies:
+    aes-decrypter "3.0.0"
+    global "^4.3.0"
+    m3u8-parser "4.2.0"
+    mpd-parser "0.7.0"
+    mux.js "5.0.1"
+    url-toolkit "^2.1.3"
+    video.js "^6.8.0 || ^7.0.0"
+
 abab@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.0.tgz#aba0ab4c5eee2d4c79d3487d85450fb2376ebb0f"
@@ -617,21 +650,21 @@ acorn@^3.0.4:
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-3.3.0.tgz#45e37fb39e8da3f25baee3ff5369e2bb5f22017a"
   integrity sha1-ReN/s56No/JbruP/U2niu18iAXo=
 
-acorn@^4.0.3, acorn@^4.0.4:
+acorn@^4.0.3:
   version "4.0.11"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-4.0.11.tgz#edcda3bd937e7556410d42ed5860f67399c794c0"
   integrity sha1-7c2jvZN+dVZBDULtWGD2c5nHlMA=
 
+acorn@^5.0.0, acorn@^5.5.3:
+  version "5.7.3"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.7.3.tgz#67aa231bf8812974b85235a96771eb6bd07ea279"
+  integrity sha512-T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw==
+
 acorn@^5.1.1:
   version "5.2.1"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.2.1.tgz#317ac7821826c22c702d66189ab8359675f135d7"
   integrity sha512-jG0u7c4Ly+3QkkW18V+NRDN+4bWHdln30NL1ZL2AvFZZmQe/BfopYCtghCKKVBUSetZ4QKcyA0pY6/4Gw8Pv8w==
 
-acorn@^5.5.3:
-  version "5.7.3"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.7.3.tgz#67aa231bf8812974b85235a96771eb6bd07ea279"
-  integrity sha512-T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw==
-
 acorn@^6.0.1:
   version "6.0.2"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.0.2.tgz#6a459041c320ab17592c6317abbfdf4bbaa98ca4"
@@ -650,12 +683,14 @@ adjust-sourcemap-loader@^1.1.0:
     object-path "^0.9.2"
     regex-parser "^2.2.1"
 
-aes-decrypter@1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/aes-decrypter/-/aes-decrypter-1.0.3.tgz#9c06b8a5435a5ad09db933f8a014afcf184cc34e"
-  integrity sha1-nAa4pUNaWtCduTP4oBSvzxhMw04=
+aes-decrypter@3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/aes-decrypter/-/aes-decrypter-3.0.0.tgz#7848a1c145b9fdbf57ae3e2b5b1bc7cf0644a8fb"
+  integrity sha1-eEihwUW5/b9Xrj4rWxvHzwZEqPs=
   dependencies:
-    pkcs7 "^0.2.3"
+    commander "^2.9.0"
+    global "^4.3.2"
+    pkcs7 "^1.0.2"
 
 agent-base@^4.1.0:
   version "4.2.1"
@@ -2054,7 +2089,7 @@ braces@^1.8.2:
     preserve "^0.2.0"
     repeat-element "^1.1.2"
 
-braces@^2.3.1:
+braces@^2.3.0, braces@^2.3.1:
   version "2.3.2"
   resolved "https://registry.yarnpkg.com/braces/-/braces-2.3.2.tgz#5979fd3f14cd531565e5fa2df1abfff1dfaee729"
   integrity sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==
@@ -2387,7 +2422,7 @@ chardet@^0.7.0:
   resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e"
   integrity sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==
 
-chokidar@^1.4.3, chokidar@^1.6.0:
+chokidar@^1.6.0:
   version "1.6.1"
   resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-1.6.1.tgz#2f4447ab5e96e50fb3d789fd90d4c72e0e4c70c2"
   integrity sha1-L0RHq16W5Q+z14n9kNTHLg5McMI=
@@ -2403,6 +2438,26 @@ chokidar@^1.4.3, chokidar@^1.6.0:
   optionalDependencies:
     fsevents "^1.0.0"
 
+chokidar@^2.0.2:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.0.4.tgz#356ff4e2b0e8e43e322d18a372460bbcf3accd26"
+  integrity sha512-z9n7yt9rOvIJrMhvDtDictKrkFHeihkNl6uWMmZlmL6tJtX9Cs+87oK+teBx+JIgzvbX3yZHT3eF8vpbDxHJXQ==
+  dependencies:
+    anymatch "^2.0.0"
+    async-each "^1.0.0"
+    braces "^2.3.0"
+    glob-parent "^3.1.0"
+    inherits "^2.0.1"
+    is-binary-path "^1.0.0"
+    is-glob "^4.0.0"
+    lodash.debounce "^4.0.8"
+    normalize-path "^2.1.1"
+    path-is-absolute "^1.0.0"
+    readdirp "^2.0.0"
+    upath "^1.0.5"
+  optionalDependencies:
+    fsevents "^1.2.2"
+
 chownr@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.0.1.tgz#e2a75042a9551908bebd25b8523d5f9769d79181"
@@ -3383,15 +3438,15 @@ end-of-stream@^1.0.0, end-of-stream@^1.1.0:
   dependencies:
     once "^1.4.0"
 
-enhanced-resolve@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-3.1.0.tgz#9f4b626f577245edcf4b2ad83d86e17f4f421dec"
-  integrity sha1-n0tib1dyRe3PSyrYPYbhf09CHew=
+enhanced-resolve@^3.3.0:
+  version "3.4.1"
+  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-3.4.1.tgz#0421e339fd71419b3da13d129b3979040230476e"
+  integrity sha1-BCHjOf1xQZs9oT0Smzl5BAIwR24=
   dependencies:
     graceful-fs "^4.1.2"
     memory-fs "^0.4.0"
     object-assign "^4.0.1"
-    tapable "^0.2.5"
+    tapable "^0.2.7"
 
 entities@~1.1.1:
   version "1.1.1"
@@ -3784,10 +3839,10 @@ expect@^23.6.0:
     jest-message-util "^23.4.0"
     jest-regex-util "^23.3.0"
 
-expose-loader@^0.7.4:
-  version "0.7.4"
-  resolved "https://registry.yarnpkg.com/expose-loader/-/expose-loader-0.7.4.tgz#9bcdd3878b5da9107930b55a03f65afe90b3314a"
-  integrity sha512-lweINkewAXcQtNjd7j1gO3cd8O/8lNYijsEwH4YZ+Dv3gT2Kh9/YvJov5Mdp2A75QIhgOvsSyRa/ZG3wYjNZpA==
+expose-loader@^0.7.5:
+  version "0.7.5"
+  resolved "https://registry.yarnpkg.com/expose-loader/-/expose-loader-0.7.5.tgz#e29ea2d9aeeed3254a3faa1b35f502db9f9c3f6f"
+  integrity sha512-iPowgKUZkTPX5PznYsmifVj9Bob0w2wTHVkt/eYNPSzyebkUgIedmskf/kcfEIWpiWjg3JRjnW+a17XypySMuw==
 
 express@^4.13.3:
   version "4.14.1"
@@ -4308,7 +4363,7 @@ fsevents@^1.0.0:
     nan "^2.3.0"
     node-pre-gyp "^0.6.29"
 
-fsevents@^1.2.3:
+fsevents@^1.2.2, fsevents@^1.2.3:
   version "1.2.4"
   resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.4.tgz#f41dcb1af2582af3692da36fc55cbd8e1041c426"
   integrity sha512-z8H8/diyk76B7q5wg+Ud0+CqzcAF3mBBI/bA5ne5zrRUUIvNkJY//D3BqyH571KuAC4Nr7Rw7CjWX4r0y9DvNg==
@@ -4439,6 +4494,14 @@ glob-parent@^2.0.0:
   dependencies:
     is-glob "^2.0.0"
 
+glob-parent@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-3.1.0.tgz#9e6af6299d8d3bd2bd40430832bd113df906c5ae"
+  integrity sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=
+  dependencies:
+    is-glob "^3.1.0"
+    path-dirname "^1.0.0"
+
 glob@^6.0.4:
   version "6.0.4"
   resolved "https://registry.yarnpkg.com/glob/-/glob-6.0.4.tgz#0f08860f6a155127b2fadd4f9ce24b1aab6e4d22"
@@ -5194,7 +5257,7 @@ is-extglob@^1.0.0:
   resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-1.0.0.tgz#ac468177c4943405a092fc8f29760c6ffc6206c0"
   integrity sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=
 
-is-extglob@^2.1.0:
+is-extglob@^2.1.0, is-extglob@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
   integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=
@@ -5242,6 +5305,13 @@ is-glob@^3.1.0:
   dependencies:
     is-extglob "^2.1.0"
 
+is-glob@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.0.tgz#9521c76845cc2610a85203ddf080a958c2ffabc0"
+  integrity sha1-lSHHaEXMJhCoUgPd8ICpWML/q8A=
+  dependencies:
+    is-extglob "^2.1.1"
+
 is-my-json-valid@^2.10.0, is-my-json-valid@^2.12.4:
   version "2.15.0"
   resolved "https://registry.yarnpkg.com/is-my-json-valid/-/is-my-json-valid-2.15.0.tgz#936edda3ca3c211fd98f3b2d3e08da43f7b2915b"
@@ -6209,6 +6279,11 @@ lodash.clonedeep@^4.3.2:
   resolved "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef"
   integrity sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=
 
+lodash.debounce@^4.0.8:
+  version "4.0.8"
+  resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af"
+  integrity sha1-gteb/zCmfEAF/9XiUVMArZyk168=
+
 lodash.defaults@^3.1.2:
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/lodash.defaults/-/lodash.defaults-3.1.2.tgz#c7308b18dbf8bc9372d701a73493c61192bd2e2c"
@@ -6332,10 +6407,10 @@ lru-cache@^4.1.1:
     pseudomap "^1.0.2"
     yallist "^2.1.2"
 
-m3u8-parser@2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/m3u8-parser/-/m3u8-parser-2.1.0.tgz#c8170329ec1cd515d0d58bb8b762da9896cb0368"
-  integrity sha1-yBcDKewc1RXQ1Yu4t2LamJbLA2g=
+m3u8-parser@4.2.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/m3u8-parser/-/m3u8-parser-4.2.0.tgz#c8e0785fd17f741f4408b49466889274a9e36447"
+  integrity sha512-LVHw0U6IPJjwk9i9f7Xe26NqaUHTNlIt4SSWoEfYFROeVKHN6MIjOhbRheI3dg8Jbq5WCuMFQ0QU3EgZpmzFPg==
 
 macaddress@^0.2.8:
   version "0.2.8"
@@ -6647,6 +6722,14 @@ move-concurrently@^1.0.1:
     rimraf "^2.5.4"
     run-queue "^1.0.3"
 
+mpd-parser@0.7.0:
+  version "0.7.0"
+  resolved "https://registry.yarnpkg.com/mpd-parser/-/mpd-parser-0.7.0.tgz#d36e3322579fce23d657f71a3c2f3e6cc5ce4002"
+  integrity sha512-nkzVIkecaDz3q7p4ToN3GR0FV2Odbh0w2sJ8ijsyw79JcBrJoUD3KHIiI8gL0hEDlex7mrVpTxXBsRHowUBmPw==
+  dependencies:
+    global "^4.3.2"
+    url-toolkit "^2.1.1"
+
 ms@0.7.1:
   version "0.7.1"
   resolved "https://registry.yarnpkg.com/ms/-/ms-0.7.1.tgz#9cd13c03adbff25b65effde7ce864ee952017098"
@@ -6677,15 +6760,15 @@ mute-stream@0.0.7:
   resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab"
   integrity sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s=
 
-mux.js@4.1.1:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/mux.js/-/mux.js-4.1.1.tgz#8a211f614c974c4afdb5ee6588444626accc5774"
-  integrity sha1-iiEfYUyXTEr9te5liERGJqzMV3Q=
+mux.js@4.5.1:
+  version "4.5.1"
+  resolved "https://registry.yarnpkg.com/mux.js/-/mux.js-4.5.1.tgz#1d70f1ad9b951315e16390d47be8fc42fd080194"
+  integrity sha512-j4rEyZKCRinGaSiBxPx9YD9B782TMPHPOlKyaMY07vIGTNYg4ouCEBvL6zX9Hh1k1fKZ5ZF3S7c+XVk6PB+Igw==
 
-mux.js@4.3.2:
-  version "4.3.2"
-  resolved "https://registry.yarnpkg.com/mux.js/-/mux.js-4.3.2.tgz#576d537df037dc5ec35ec1316b948d815d35c210"
-  integrity sha512-g0q6DPdvb3yYcoK7ElBGobdSSrhY/RjPt19U7uUc733aqvc5bCS/aCvL9z+448y+IoCZnYDwyZfQBBXMSmGOaQ==
+mux.js@5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/mux.js/-/mux.js-5.0.1.tgz#ccf757d18f30e65179bd38d60ccc9f04e9cb1e3a"
+  integrity sha512-yfmJ9CaLGSyRnEwqwzvISSZe6EdcvXIsgapZfuNNFuUQUlYDwltnCgZqV6IG90daY4dYTemK/hxMoxI1bB6RjA==
 
 nan@^2.3.0, nan@^2.3.2:
   version "2.5.1"
@@ -6740,6 +6823,11 @@ negotiator@0.6.1:
   resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.1.tgz#2b327184e8992101177b28563fb5e7102acd0ca9"
   integrity sha1-KzJxhOiZIQEXeyhWP7XnECrNDKk=
 
+neo-async@^2.5.0:
+  version "2.6.0"
+  resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.0.tgz#b9d15e4d71c6762908654b5183ed38b753340835"
+  integrity sha512-MFh0d/Wa7vkKO3Y3LlacqAEeHK0mckVqzDieUKTT+KGxi+zIpeVsFxymkIiRpbpDziHc290Xr9A1O4Om7otoRA==
+
 no-case@^2.2.0:
   version "2.3.1"
   resolved "https://registry.yarnpkg.com/no-case/-/no-case-2.3.1.tgz#7aeba1c73a52184265554b7dc03baf720df80081"
@@ -7325,6 +7413,11 @@ path-browserify@0.0.0:
   resolved "https://registry.yarnpkg.com/path-browserify/-/path-browserify-0.0.0.tgz#a0b870729aae214005b7d5032ec2cbbb0fb4451a"
   integrity sha1-oLhwcpquIUAFt9UDLsLLuw+0RRo=
 
+path-dirname@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/path-dirname/-/path-dirname-1.0.2.tgz#cc33d24d525e099a5388c0336c6e32b9160609e0"
+  integrity sha1-zDPSTVJeCZpTiMAzbG4yuRYGCeA=
+
 path-exists@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-2.1.0.tgz#0feb6c64f0fc518d9a754dd5efb62c7022761f4b"
@@ -7417,10 +7510,10 @@ pinkie@^2.0.0:
   resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870"
   integrity sha1-clVrgM+g1IqXToDnckjoDtT3+HA=
 
-pkcs7@^0.2.3:
-  version "0.2.3"
-  resolved "https://registry.yarnpkg.com/pkcs7/-/pkcs7-0.2.3.tgz#22d60666d01065c5f24439098e4a4830452273be"
-  integrity sha1-ItYGZtAQZcXyRDkJjkpIMEUic74=
+pkcs7@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/pkcs7/-/pkcs7-1.0.2.tgz#b6dba527528c2942bfc122ce2dafcdb5e59074e7"
+  integrity sha1-ttulJ1KMKUK/wSLOLa/NteWQdOc=
 
 pkg-dir@^1.0.0:
   version "1.0.0"
@@ -8222,6 +8315,11 @@ regenerator-runtime@^0.11.0:
   resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz#be05ad7f9bf7d22e056f9726cee5017fbf19e2e9"
   integrity sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==
 
+regenerator-runtime@^0.12.0:
+  version "0.12.1"
+  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.12.1.tgz#fa1a71544764c036f8c49b13a08b2594c9f8a0de"
+  integrity sha512-odxIc1/vDlo4iZcfXqRYFj0vpXFNoGdKMAUieAlFYO6m/nl5e9KR/beGf41z4a1FI+aQgtjhuaSlDxQ0hmkrHg==
+
 regenerator-transform@0.9.8:
   version "0.9.8"
   resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.9.8.tgz#0f88bb2bc03932ddb7b6b7312e68078f01026d6c"
@@ -9368,7 +9466,12 @@ table@^3.7.8:
     slice-ansi "0.0.4"
     string-width "^2.0.0"
 
-tapable@^0.2.5, tapable@~0.2.5:
+tapable@^0.2.7:
+  version "0.2.9"
+  resolved "https://registry.yarnpkg.com/tapable/-/tapable-0.2.9.tgz#af2d8bbc9b04f74ee17af2b4d9048f807acd18a8"
+  integrity sha512-2wsvQ+4GwBvLPLWsNfLCDYGsW6xb7aeC6utq2Qh0PFwgEy7K7dsma9Jsmb2zSQj7GvYAyUGSntLtsv++GmgL1A==
+
+tapable@~0.2.5:
   version "0.2.6"
   resolved "https://registry.yarnpkg.com/tapable/-/tapable-0.2.6.tgz#206be8e188860b514425375e6f1ae89bfb01fd8d"
   integrity sha1-IGvo4YiGC1FEJTdebxrom/sB/Y0=
@@ -9636,7 +9739,7 @@ uglify-es@^3.3.4:
     commander "~2.13.0"
     source-map "~0.6.1"
 
-uglify-js@2.7.x, uglify-js@^2.7.5:
+uglify-js@2.7.x:
   version "2.7.5"
   resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-2.7.5.tgz#4612c0c7baaee2ba7c487de4904ae122079f2ca8"
   integrity sha1-RhLAx7qu4rp8SH3kkErhIgefLKg=
@@ -9646,6 +9749,16 @@ uglify-js@2.7.x, uglify-js@^2.7.5:
     uglify-to-browserify "~1.0.0"
     yargs "~3.10.0"
 
+uglify-js@^2.8.27:
+  version "2.8.29"
+  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-2.8.29.tgz#29c5733148057bb4e1f75df35b7a9cb72e6a59dd"
+  integrity sha1-KcVzMUgFe7Th913zW3qcty5qWd0=
+  dependencies:
+    source-map "~0.5.1"
+    yargs "~3.10.0"
+  optionalDependencies:
+    uglify-to-browserify "~1.0.0"
+
 uglify-js@^3.1.4:
   version "3.4.9"
   resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.4.9.tgz#af02f180c1207d76432e473ed24a28f4a782bae3"
@@ -9768,6 +9881,11 @@ unset-value@^1.0.0:
     has-value "^0.3.1"
     isobject "^3.0.0"
 
+upath@^1.0.5:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/upath/-/upath-1.1.0.tgz#35256597e46a581db4793d0ce47fa9aebfc9fabd"
+  integrity sha512-bzpH/oBhoS/QI/YtbkqCg6VEiPYjSZtrHQM6/QnJS6OL9pKUFLqb3aFh4Scvwm45+7iAgiMkLhSbaZxUqmrprw==
+
 upper-case@^1.1.1:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/upper-case/-/upper-case-1.1.3.tgz#f6b4501c2ec4cdd26ba78be7222961de77621598"
@@ -9809,6 +9927,11 @@ url-parse@^1.1.1:
     querystringify "0.0.x"
     requires-port "1.0.x"
 
+url-toolkit@^2.1.1:
+  version "2.1.6"
+  resolved "https://registry.yarnpkg.com/url-toolkit/-/url-toolkit-2.1.6.tgz#6d03246499e519aad224c44044a4ae20544154f2"
+  integrity sha512-UaZ2+50am4HwrV2crR/JAf63Q4VvPYphe63WGeoJxeu8gmOm0qxPt+KsukfakPNrX9aymGNEkkaoICwn+OuvBw==
+
 url-toolkit@^2.1.3:
   version "2.1.4"
   resolved "https://registry.yarnpkg.com/url-toolkit/-/url-toolkit-2.1.4.tgz#e0dac60e5fdd50b8ac984307699e8b72439b3fd3"
@@ -9934,25 +10057,10 @@ video.js@^5.10.1:
     videojs-vtt.js "0.12.2"
     xhr "2.2.2"
 
-video.js@^5.17.0:
-  version "5.19.1"
-  resolved "https://registry.yarnpkg.com/video.js/-/video.js-5.19.1.tgz#5d6407aebd078bf4c4f94183f840a53388c34f25"
-  integrity sha1-XWQHrr0Hi/TE+UGD+EClM4jDTyU=
-  dependencies:
-    babel-runtime "^6.9.2"
-    global "4.3.0"
-    safe-json-parse "4.0.0"
-    tsml "1.0.1"
-    videojs-font "2.0.0"
-    videojs-ie8 "1.1.2"
-    videojs-swf "5.3.0"
-    videojs-vtt.js "0.12.3"
-    xhr "2.2.2"
-
-"video.js@^5.17.0 || ^6.2.0", video.js@^6.9.0:
-  version "6.9.0"
-  resolved "https://registry.yarnpkg.com/video.js/-/video.js-6.9.0.tgz#8ad4fbc8d7380b60c703f0a780bc21796a5666cf"
-  integrity sha512-54s7ZZKiY8dTMxBM6IkGMUeG0Yjq8RfyOn7bdU88nL6eWw1I+zLPY4fUVEFwGtxNAzZxGj7VVhVsCM/38QM9GA==
+"video.js@^5.19.2 || ^6":
+  version "6.8.0"
+  resolved "https://registry.yarnpkg.com/video.js/-/video.js-6.8.0.tgz#c3cff35d483595e22efc294ba2e720198151f9c9"
+  integrity sha512-Yig2ImqVQVaOidXUoKXh6tuVhRkHjeH9jMjBjwRQcsy07XDbGHzaJw9hjESHK1crIm2XnTnKXYdo24lbpNTENg==
   dependencies:
     babel-runtime "^6.9.2"
     global "4.3.2"
@@ -9963,32 +10071,32 @@ video.js@^5.17.0:
     videojs-vtt.js "0.12.6"
     xhr "2.4.0"
 
-"video.js@^5.19.1 || ^6.2.0":
-  version "6.5.0"
-  resolved "https://registry.yarnpkg.com/video.js/-/video.js-6.5.0.tgz#407ce9dc9c5f506d6710cd22b7d2f706b3acd275"
-  integrity sha1-QHzp3JxfUG1nEM0it9L3BrOs0nU=
+"video.js@^5.19.2 || ^6 || ^7", "video.js@^6 || ^7", "video.js@^6.8.0 || ^7.0.0":
+  version "7.3.0"
+  resolved "https://registry.yarnpkg.com/video.js/-/video.js-7.3.0.tgz#780de68a163b4ee16dfcacd78971680f18c9a68d"
+  integrity sha512-yJX8QlTIEpo2YN9G1RpKqIlLS9jqg8NNNN+IK2Z6vHhM6QUBzmaDFEr+BYGnvx8p7X90/SjRH1RHTPvKhghNUw==
   dependencies:
-    babel-runtime "^6.9.2"
+    "@babel/runtime" "^7.0.0"
+    "@videojs/http-streaming" "1.4.1"
     global "4.3.2"
     safe-json-parse "4.0.0"
     tsml "1.0.1"
-    videojs-font "2.0.0"
-    videojs-ie8 "1.1.2"
-    videojs-vtt.js "0.12.4"
+    videojs-font "3.1.0"
+    videojs-vtt.js "0.14.1"
     xhr "2.4.0"
 
-"video.js@^5.19.2 || ^6":
-  version "6.8.0"
-  resolved "https://registry.yarnpkg.com/video.js/-/video.js-6.8.0.tgz#c3cff35d483595e22efc294ba2e720198151f9c9"
-  integrity sha512-Yig2ImqVQVaOidXUoKXh6tuVhRkHjeH9jMjBjwRQcsy07XDbGHzaJw9hjESHK1crIm2XnTnKXYdo24lbpNTENg==
+video.js@^7.4.1:
+  version "7.4.1"
+  resolved "https://registry.yarnpkg.com/video.js/-/video.js-7.4.1.tgz#41349d3b0ca40fa281c6f906381a0a41b75bd04e"
+  integrity sha512-UmTHiJWcil8YN65M1t/d63X6ofLtQwnvJoYEN4VKzkECYIHbgzvMRgOmrf5bNtVeDC6JsFKLZQXJ7s6Au2jgcQ==
   dependencies:
-    babel-runtime "^6.9.2"
+    "@babel/runtime" "^7.2.0"
+    "@videojs/http-streaming" "1.5.1"
     global "4.3.2"
     safe-json-parse "4.0.0"
     tsml "1.0.1"
-    videojs-font "2.1.0"
-    videojs-ie8 "1.1.2"
-    videojs-vtt.js "0.12.6"
+    videojs-font "3.1.0"
+    videojs-vtt.js "0.14.1"
     xhr "2.4.0"
 
 videojs-contextmenu@^1.2.2:
@@ -10006,47 +10114,13 @@ videojs-contrib-ads@^6:
     global "^4.3.2"
     video.js "^5.19.2 || ^6"
 
-videojs-contrib-ads@^6.2.0:
-  version "6.4.1"
-  resolved "https://registry.yarnpkg.com/videojs-contrib-ads/-/videojs-contrib-ads-6.4.1.tgz#17121b5c5af9824fdfb625c2eefbf84267a89115"
-  integrity sha512-VGXIN5txrtT+liIUyqE7V9Hn05iAEFJj2zbR/vA/6odZpqQKSVW7le8ayQwyBKu5wbXyTpGy4kNmROAnJik2fg==
+videojs-contrib-ads@^6.6.1:
+  version "6.6.1"
+  resolved "https://registry.yarnpkg.com/videojs-contrib-ads/-/videojs-contrib-ads-6.6.1.tgz#edb0733e3e8c8849fa70ebf7342201ea99f93eef"
+  integrity sha512-U/9Z5vKA1TWZURuCW8h9ohIoZ8/xUdS4rLc11mNf7sznWBYOatdyf9aQ2z2afWCRQjnDG2/dcPYuht+85yLDbA==
   dependencies:
     global "^4.3.2"
-    video.js "^5.19.2 || ^6"
-
-videojs-contrib-hls@^5.14.1:
-  version "5.14.1"
-  resolved "https://registry.yarnpkg.com/videojs-contrib-hls/-/videojs-contrib-hls-5.14.1.tgz#eba4f4f6772a74a68ee7a213536ed7d2738972bd"
-  integrity sha512-4cweiLxl54ozIMaXrgLLEQXRs0ZbDWt9LNaDvVUQHIBgPCzcM6B8/E5rLKBGpL2h31yJlLAcSI/DFDSczNDzoQ==
-  dependencies:
-    aes-decrypter "1.0.3"
-    global "^4.3.0"
-    m3u8-parser "2.1.0"
-    mux.js "4.3.2"
-    url-toolkit "^2.1.3"
-    video.js "^5.19.1 || ^6.2.0"
-    videojs-contrib-media-sources "4.7.2"
-    webwackify "0.1.6"
-
-videojs-contrib-media-sources@4.7.2:
-  version "4.7.2"
-  resolved "https://registry.yarnpkg.com/videojs-contrib-media-sources/-/videojs-contrib-media-sources-4.7.2.tgz#0adf929107d5b74cf2c8abb2824c82177e43858e"
-  integrity sha512-e6iCHWBFuV05EGo7v+pS9iepObXnJ9joms467gzi8ZjpKVb3ifha9M0Ja24Rd8JfvYpzjltsgDVtGFDvIg4hQQ==
-  dependencies:
-    global "^4.3.0"
-    mux.js "4.3.2"
-    video.js "^5.17.0 || ^6.2.0"
-    webwackify "0.1.6"
-
-videojs-contrib-media-sources@^4.4.2:
-  version "4.4.2"
-  resolved "https://registry.yarnpkg.com/videojs-contrib-media-sources/-/videojs-contrib-media-sources-4.4.2.tgz#39c4fdaf278fd61e65d9b25513c9723dc3d2a160"
-  integrity sha1-OcT9ryeP1h5l2bJVE8lyPcPSoWA=
-  dependencies:
-    global "^4.3.0"
-    mux.js "4.1.1"
-    video.js "^5.17.0"
-    webworkify "1.0.2"
+    video.js "^5.19.2 || ^6 || ^7"
 
 videojs-font@2.0.0:
   version "2.0.0"
@@ -10058,6 +10132,11 @@ videojs-font@2.1.0:
   resolved "https://registry.yarnpkg.com/videojs-font/-/videojs-font-2.1.0.tgz#a25930a67f6c9cfbf2bb88dacb8c6b451f093379"
   integrity sha1-olkwpn9snPvyu4jay4xrRR8JM3k=
 
+videojs-font@3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/videojs-font/-/videojs-font-3.1.0.tgz#ac33be9b517fe19299f61cccd2b3c7d75a1c6960"
+  integrity sha512-rxB68SVgbHD+kSwoNWNCHicKJuR2ga3bGfvGxmB+8fupsiLbnyCwTBVtrZUq4bZnD64mrKP1DxHiutxwrs59pQ==
+
 videojs-ie8@1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/videojs-ie8/-/videojs-ie8-1.1.2.tgz#a23d3d8608ad7192b69c6077fc4eb848998d35d9"
@@ -10074,12 +10153,13 @@ videojs-ima@^1.5.1:
     video.js "^5.19.2 || ^6"
     videojs-contrib-ads "^6"
 
-videojs-per-source-behaviors@^1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/videojs-per-source-behaviors/-/videojs-per-source-behaviors-1.1.3.tgz#a847f7bb5d689d0be631e820707f88ede591d68d"
-  integrity sha1-qEf3u11onQvmMeggcH+I7eWR1o0=
+videojs-per-source-behaviors@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/videojs-per-source-behaviors/-/videojs-per-source-behaviors-2.1.0.tgz#8543f33d9127ec5d17abd8af4c1e5b789afdca4c"
+  integrity sha512-oJRjO3QhFlyPiobjvh1FaoWr3eL3iJAY3HTqSBwSRS07GmvaCe8wAzH22+wBFNDgw9NIXZ3Cqj2trld6+bFhIQ==
   dependencies:
-    video.js "^5.10.1"
+    global "^4.3.2"
+    video.js "^6 || ^7"
 
 videojs-swf@5.3.0:
   version "5.3.0"
@@ -10091,18 +10171,6 @@ videojs-vtt.js@0.12.2:
   resolved "https://registry.yarnpkg.com/videojs-vtt.js/-/videojs-vtt.js-0.12.2.tgz#9e577ca6912265ed6934f79657bcd9fca336943a"
   integrity sha1-nld8ppEiZe1pNPeWV7zZ/KM2lDo=
 
-videojs-vtt.js@0.12.3:
-  version "0.12.3"
-  resolved "https://registry.yarnpkg.com/videojs-vtt.js/-/videojs-vtt.js-0.12.3.tgz#5ec6606844544790a795e8e396e3f2ab3649a2d6"
-  integrity sha1-XsZgaERUR5CnlejjluPyqzZJotY=
-
-videojs-vtt.js@0.12.4:
-  version "0.12.4"
-  resolved "https://registry.yarnpkg.com/videojs-vtt.js/-/videojs-vtt.js-0.12.4.tgz#38f2499e31efb3fa93590ddad4cb663275a4b161"
-  integrity sha1-OPJJnjHvs/qTWQ3a1MtmMnWksWE=
-  dependencies:
-    global "^4.3.1"
-
 videojs-vtt.js@0.12.6:
   version "0.12.6"
   resolved "https://registry.yarnpkg.com/videojs-vtt.js/-/videojs-vtt.js-0.12.6.tgz#e078600bda899eaa6f9c3307134cd0c811947b8e"
@@ -10110,6 +10178,13 @@ videojs-vtt.js@0.12.6:
   dependencies:
     global "^4.3.1"
 
+videojs-vtt.js@0.14.1:
+  version "0.14.1"
+  resolved "https://registry.yarnpkg.com/videojs-vtt.js/-/videojs-vtt.js-0.14.1.tgz#da583eb1fc9c81c826a9432b706040e8dea49911"
+  integrity sha512-YxOiywx6N9t3J5nqsE5WN2Sw4CSqVe3zV+AZm2T4syOc2buNJaD6ZoexSdeszx2sHLU/RRo2r4BJAXFDQ7Qo2Q==
+  dependencies:
+    global "^4.3.1"
+
 vm-browserify@0.0.4:
   version "0.0.4"
   resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-0.0.4.tgz#5d7ea45bbef9e4a6ff65f95438e0a87c357d5a73"
@@ -10148,14 +10223,14 @@ watch@~0.18.0:
     exec-sh "^0.2.0"
     minimist "^1.2.0"
 
-watchpack@^1.2.0:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-1.2.1.tgz#01efa80c5c29e5c56ba55d6f5470a35b6402f0b2"
-  integrity sha1-Ae+oDFwp5cVrpV1vVHCjW2QC8LI=
+watchpack@^1.3.1:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-1.6.0.tgz#4bc12c2ebe8aa277a71f1d3f14d685c7b446cd00"
+  integrity sha512-i6dHe3EyLjMmDlU1/bGQpEw25XSjkJULPuAVKCbNRefQVq48yXKUpwg538F7AZTf9kyr57zj++pQFltUa5H7yA==
   dependencies:
-    async "^2.1.2"
-    chokidar "^1.4.3"
+    chokidar "^2.0.2"
     graceful-fs "^4.1.2"
+    neo-async "^2.5.0"
 
 wbuf@^1.1.0, wbuf@^1.4.0:
   version "1.7.2"
@@ -10241,7 +10316,7 @@ webpack-shell-plugin@^0.5.0:
   resolved "https://registry.yarnpkg.com/webpack-shell-plugin/-/webpack-shell-plugin-0.5.0.tgz#29b8a1d80ddeae0ddb10e729667f728653c2c742"
   integrity sha1-Kbih2A3erg3bEOcpZn9yhlPCx0I=
 
-webpack-sources@^0.1.0, webpack-sources@^0.1.4:
+webpack-sources@^0.1.0:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-0.1.4.tgz#ccc2c817e08e5fa393239412690bb481821393cd"
   integrity sha1-zMLIF+COX6OTI5QSaQu0gYITk80=
@@ -10257,19 +10332,20 @@ webpack-sources@^1.0.1, webpack-sources@^1.1.0:
     source-list-map "^2.0.0"
     source-map "~0.6.1"
 
-webpack@^2.2.1:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-2.2.1.tgz#7bb1d72ae2087dd1a4af526afec15eed17dda475"
-  integrity sha1-e7HXKuIIfdGkr1Jq/sFe7RfdpHU=
+webpack@^2.7.0:
+  version "2.7.0"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-2.7.0.tgz#b2a1226804373ffd3d03ea9c6bd525067034f6b1"
+  integrity sha512-MjAA0ZqO1ba7ZQJRnoCdbM56mmFpipOPUv/vQpwwfSI42p5PVDdoiuK2AL2FwFUVgT859Jr43bFZXRg/LNsqvg==
   dependencies:
-    acorn "^4.0.4"
+    acorn "^5.0.0"
     acorn-dynamic-import "^2.0.0"
     ajv "^4.7.0"
     ajv-keywords "^1.1.1"
     async "^2.1.2"
-    enhanced-resolve "^3.0.0"
+    enhanced-resolve "^3.3.0"
     interpret "^1.0.0"
     json-loader "^0.5.4"
+    json5 "^0.5.1"
     loader-runner "^2.3.0"
     loader-utils "^0.2.16"
     memory-fs "~0.4.1"
@@ -10278,9 +10354,9 @@ webpack@^2.2.1:
     source-map "^0.5.3"
     supports-color "^3.1.0"
     tapable "~0.2.5"
-    uglify-js "^2.7.5"
-    watchpack "^1.2.0"
-    webpack-sources "^0.1.4"
+    uglify-js "^2.8.27"
+    watchpack "^1.3.1"
+    webpack-sources "^1.0.1"
     yargs "^6.0.0"
 
 websocket-driver@>=0.5.1:
@@ -10295,21 +10371,11 @@ websocket-extensions@>=0.1.1:
   resolved "https://registry.yarnpkg.com/websocket-extensions/-/websocket-extensions-0.1.1.tgz#76899499c184b6ef754377c2dbb0cd6cb55d29e7"
   integrity sha1-domUmcGEtu91Q3fC27DNbLVdKec=
 
-webwackify@0.1.6:
-  version "0.1.6"
-  resolved "https://registry.yarnpkg.com/webwackify/-/webwackify-0.1.6.tgz#1d42a12ac61823d7e345abde084eaaa62a4a95eb"
-  integrity sha512-pGcw1T3HpNnM/UTRQqqRkkkzythSLts05mB+7Gr00B+0VbL0m39dFL5g20rSIEUt9Wrpw+/8k+snxRlUFHhcqA==
-
 webworkify-webpack2@^1.1.9:
   version "1.1.9"
   resolved "https://registry.yarnpkg.com/webworkify-webpack2/-/webworkify-webpack2-1.1.9.tgz#182fdf2230127c61a3e3ac15f949abdcb23fd26a"
   integrity sha1-GC/fIjASfGGj46wV+Umr3LI/0mo=
 
-webworkify@1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/webworkify/-/webworkify-1.0.2.tgz#b616a95a6225249bf25a91e96e0942c665155995"
-  integrity sha1-thapWmIlJJvyWpHpbglCxmUVWZU=
-
 whatwg-encoding@^1.0.1, whatwg-encoding@^1.0.3:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/whatwg-encoding/-/whatwg-encoding-1.0.4.tgz#63fb016b7435b795d9025632c086a5209dbd2621"