use webpack umd deps manager

Peer5 · May 1, 2017 · 8241097 · 8241097
1 parent 58233ca
commit 8241097
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 22 deletions.
diff --git a/README.md b/README.md
@@ -4,6 +4,7 @@ Plays HLS with [video.js](https://github.com/videojs/video.js) on any platform,
 This bundled plugin is an **alternative** to the original [videojs-contrib-hls](https://github.com/videojs/videojs-contrib-hls) and runs directly on top of [video.js 5.0+](https://github.com/videojs/video.js).
 
 Like the original implementation, this plugin implements a source handler for m3u8 files.
+`hls.js` is bundled inside and there is no need to include it in addition.
 
 ## Installation
 ### NPM

diff --git a/dist/videojs-contrib-hlsjs.min.js b/dist/videojs-contrib-hlsjs.min.js
diff --git a/dist/videojs-contrib-hlsjs.min.js.map b/dist/videojs-contrib-hlsjs.min.js.map
diff --git a/examples/example.html b/examples/example.html
@@ -9,7 +9,7 @@
     <!-- increase browser support with MSE polyfill -->
     <script src="http://unpkg.com/videojs-contrib-media-sources@4.4.4/dist/videojs-contrib-media-sources.min.js"></script>
 
-    <script src="../dist/videojs-contrib-hlsjs.js"></script>
+    <script src="../dist/videojs-contrib-hlsjs.min.js"></script>
 </head>
 <body>
 <video id="player" class="video-js vjs-default-skin" height="360" width="640" controls preload="none">
@@ -20,4 +20,4 @@
     var player = videojs('#player');
 </script>
 </body>
-</html>
+</html>
diff --git a/src/videojs5.hlsjs.js b/src/videojs5.hlsjs.js
@@ -137,15 +137,7 @@ var HlsSourceHandler = {
 };
 
 if (Hls.isSupported()) {
-  var videojs = window.videojs;
-  if (!videojs) {
-    try {
-      videojs = require('video.js');
-    }
-    catch (e) {
-      // ignore
-    }
-  }
+  var videojs = require('video.js'); // resolved UMD-wise through webpack
 
   if (videojs) {
     videojs.getComponent('Html5').registerSourceHandler(HlsSourceHandler, 0);

diff --git a/webpack.config.js b/webpack.config.js
@@ -1,13 +1,19 @@
 'use strict';
 
 module.exports = {
-    entry: __dirname + '/src/videojs5.hlsjs',
-    devtool: 'source-map',
-    output: {
-        path: __dirname + '/dist',
-        filename: 'videojs-contrib-hlsjs.min.js'
-    },
-    externals: [{
-        'video\.js': 'commonjs video.js'
-    }]
+  entry: __dirname + '/src/videojs5.hlsjs',
+  devtool: 'source-map',
+  output: {
+    path: __dirname + '/dist',
+    filename: 'videojs-contrib-hlsjs.min.js',
+    libraryTarget: 'umd'
+  },
+  externals: {
+    'video\.js': {
+      commonjs: 'video.js',
+      commonjs2: 'video.js',
+      amd: 'video.js',
+      root: 'videojs'
+    }
+  }
 };