milas/jellyfish-web
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Require hls.js from npm (#456)

Browse source 
* hlsjs

* Fix webpack libraryTarget config
This commit is contained in:
Bill Thornton 2019-09-11 05:35:41 -04:00 • committed by dkanada
parent 120b3106aa
commit ed34530b1e
7 changed files with 27 additions and 8768 deletions
Download patch file Download diff file Expand all files Collapse all files

3
package.json
View file

@ -14,7 +14,8 @@
"webpack-cli": "^3.2.3"
},
"dependencies": {
"jstree": "^3.3.7"
"jstree": "^3.3.7",
"hls.js": "^0.12.4"
},
"scripts": {
"dev": "webpack --mode development",

8745
src/bower_components/hlsjs/dist/hls.min.js vendored
View file

File diff suppressed because it is too large Load diff

19
src/bower_components/hlsjs/hls.js.sublime-project vendored
View file

@ -1,19 +0,0 @@
{
"folders":
[
{
"path": ".",
"folder_exclude_patterns": [
".git",
"node_modules",
"dist",
"lib"
],
"file_exclude_patterns": [
".gitignore",
"hls.js.sublime-project",
"hls.js.sublime-workspace"
]
}
]
}

5
src/bundle.js
View file

@ -4,6 +4,11 @@
// Use define from require.js not webpack's define
var _define = window.define;
// jstree
var jstree = require("jstree");
require("jstree/dist/themes/default/style.css");
_define("jstree", ["jQuery"], function() { return jstree; });
// hlsjs
var hlsjs = require("hls.js");
_define("hlsjs", function() { return hlsjs; });

3
src/scripts/site.js
View file

@ -713,7 +713,6 @@ var AppInfo = {};
pluginManager: componentsPath + "/pluginManager",
packageManager: componentsPath + "/packagemanager"
};
paths.hlsjs = bowerPath + "/hlsjs/dist/hls.min";
paths.flvjs = "thirdparty/flvjs/flv.min";
paths.shaka = "thirdparty/shaka/shaka-player.compiled";
define("chromecastHelper", [componentsPath + "/chromecast/chromecasthelpers"], returnFirstDependency);
@ -819,7 +818,7 @@ var AppInfo = {};
}
},
bundles: {
bundle: ["jstree"]
bundle: ["jstree", "hlsjs"]
},
urlArgs: urlArgs,
paths: paths,

2
webpack.config.js
View file

@ -7,7 +7,7 @@ module.exports = {
output: {
filename: 'bundle.js',
path: path.resolve(__dirname, 'dist'),
libraryTarget: 'amd'
libraryTarget: 'amd-require'
},
externals: [{

18
yarn.lock
View file

@ -1121,6 +1121,11 @@ esutils@^2.0.2:
resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64"
integrity sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==
eventemitter3@3.1.0:
version "3.1.0"
resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-3.1.0.tgz#090b4d6cdbd645ed10bf750d4b5407942d7ba163"
integrity sha512-ivIvhpq/Y0uSjcHDcOIccjmYjGLcP09MFGE7ysAwkAvkXfpZlC985pH2/ui64DKazbTW/4kN3yqozUxlXzI6cA==
events@^3.0.0:
version "3.0.0"
resolved "https://registry.yarnpkg.com/events/-/events-3.0.0.tgz#9a0a0dfaf62893d92b875b8f2698ca4114973e88"
@ -1526,6 +1531,14 @@ hash.js@^1.0.0, hash.js@^1.0.3:
inherits "^2.0.3"
minimalistic-assert "^1.0.1"
hls.js@^0.12.4:
version "0.12.4"
resolved "https://registry.yarnpkg.com/hls.js/-/hls.js-0.12.4.tgz#c155b7b2825a11117c111b781973c0ffa759006b"
integrity sha512-e8OPxQ60dBVsdkv4atdxR21KzC1mgwspM41qpozpj3Uv1Fz4CaeQy3FWoaV2O+QKKbNRvV5hW+/LipCWdrwnMQ==
dependencies:
eventemitter3 "3.1.0"
url-toolkit "^2.1.6"
hmac-drbg@^1.0.0:
version "1.0.1"
resolved "https://registry.yarnpkg.com/hmac-drbg/-/hmac-drbg-1.0.1.tgz#d2745701025a6c775a6c545793ed502fc0c649a1"
@ -3359,6 +3372,11 @@ urix@^0.1.0:
resolved "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72"
integrity sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=
url-toolkit@^2.1.6:
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@^0.11.0:
version "0.11.0"
resolved "https://registry.yarnpkg.com/url/-/url-0.11.0.tgz#3838e97cfc60521eb73c525a8e55bfdd9e2e28f1"