1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-web synced 2025-03-30 19:56:21 +00:00

Require hls.js from npm (#456)

* 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

File diff suppressed because it is too large Load diff

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"
]
}
]
}

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; });

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,