Skip to content

Commit fc57615

Browse files
authored
Merge branch 'master' into bugfix-7064
2 parents e0ddf41 + 81d30d5 commit fc57615

File tree

90 files changed

+8598
-5687
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

90 files changed

+8598
-5687
lines changed

.eslintrc.js

Lines changed: 13 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
11
module.exports = {
2-
env: {
3-
browser: true,
4-
commonjs: true,
5-
es6: true,
6-
},
2+
env: { browser: true, commonjs: true, es6: true },
73
globals: {
84
// Allowed globals
95
console: true,
@@ -24,11 +20,8 @@ module.exports = {
2420
// 'prettier' (https://github.com/prettier/eslint-config-prettier) must be last
2521
extends: ['eslint:recommended', 'prettier'],
2622
parser: '@typescript-eslint/parser',
27-
parserOptions: {
28-
sourceType: 'module',
29-
project: './tsconfig.json',
30-
},
31-
plugins: ['@typescript-eslint', 'import'],
23+
parserOptions: { sourceType: 'module', project: './tsconfig.json' },
24+
plugins: ['@typescript-eslint', 'import', 'no-for-of-loops'],
3225
rules: {
3326
'no-restricted-globals': [
3427
2,
@@ -37,18 +30,9 @@ module.exports = {
3730
message:
3831
'Use `self` instead of `window` to access the global context everywhere (including workers).',
3932
},
40-
{
41-
name: 'SourceBuffer',
42-
message: 'Use `self.SourceBuffer`',
43-
},
44-
{
45-
name: 'setTimeout',
46-
message: 'Use `self.setTimeout`',
47-
},
48-
{
49-
name: 'setInterval',
50-
message: 'Use `self.setInterval`',
51-
},
33+
{ name: 'SourceBuffer', message: 'Use `self.SourceBuffer`' },
34+
{ name: 'setTimeout', message: 'Use `self.setTimeout`' },
35+
{ name: 'setInterval', message: 'Use `self.setInterval`' },
5236
],
5337

5438
'no-restricted-properties': [
@@ -61,12 +45,7 @@ module.exports = {
6145
'no-var': 1,
6246
'no-empty': 1,
6347
'no-unused-vars': 'warn',
64-
'no-console': [
65-
1,
66-
{
67-
allow: ['assert'],
68-
},
69-
],
48+
'no-console': [1, { allow: ['assert'] }],
7049
'no-fallthrough': 1,
7150
'no-case-declarations': 2,
7251
'no-self-assign': 1,
@@ -78,12 +57,11 @@ module.exports = {
7857
'no-void': 2,
7958
'no-useless-catch': 2,
8059
'no-prototype-builtins': 0,
60+
'no-for-of-loops/no-for-of-loops': 2,
8161
},
8262
overrides: [
8363
{
84-
parserOptions: {
85-
project: ['./tsconfig.json'],
86-
},
64+
parserOptions: { project: ['./tsconfig.json'] },
8765
files: ['*.ts'],
8866
rules: {
8967
'no-unused-vars': 0,
@@ -92,9 +70,7 @@ module.exports = {
9270
'import/order': [
9371
'warn',
9472
{
95-
alphabetize: {
96-
order: 'asc',
97-
},
73+
alphabetize: { order: 'asc' },
9874
groups: [
9975
'builtin',
10076
'external',
@@ -108,24 +84,16 @@ module.exports = {
10884
],
10985
'sort-imports': [
11086
'error',
111-
{
112-
ignoreCase: true,
113-
ignoreDeclarationSort: true,
114-
},
87+
{ ignoreCase: true, ignoreDeclarationSort: true },
11588
],
11689
'@typescript-eslint/no-unused-vars': [
11790
'warn',
118-
{
119-
args: 'none',
120-
},
91+
{ args: 'none', caughtErrors: 'none' },
12192
],
12293
'@typescript-eslint/prefer-optional-chain': 2,
12394
'@typescript-eslint/consistent-type-assertions': [
12495
2,
125-
{
126-
assertionStyle: 'as',
127-
objectLiteralTypeAssertions: 'never',
128-
},
96+
{ assertionStyle: 'as', objectLiteralTypeAssertions: 'never' },
12997
],
13098
'@typescript-eslint/consistent-type-imports': 'error',
13199
'@typescript-eslint/no-import-type-side-effects': 'error',

.node-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
22.14.0
1+
22.17.0

MIGRATING.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,10 @@ The 1.4 version of hls.js now ships with an ESM version of the library (`dist/hl
44

55
If you are using the UMD version (`dist/hls.js`), no changes are required.
66

7-
**Important Note:** If you are using a bundler, such as webpack, the ESM version of the package will likely be used by default. If this is the case, make sure to add the `workerPath` config option after upgrading to hls.js 1.4 or above.
7+
**Important Notes:**
8+
9+
- If you are using a bundler, such as webpack, the ESM version of the package will likely be used by default. If this is the case, make sure to add the `workerPath` config option after upgrading to hls.js 1.4 or above.
10+
- Older web engines may experience severe performance degradation when using the ESM version of this package. If targeting older web engines, consider bundling your client application in `loose` mode to avoid additional function overhead. Alternatively, use the UMD/ES5 version of the package.
811

912
# Migrating from hls.js 0.x to 1.x
1013

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -443,6 +443,7 @@ The following players integrate HLS.js for HLS playback:
443443
- [CDNBye](https://github.com/cdnbye/hlsjs-p2p-engine), a p2p engine for hls.js powered by WebRTC Datachannel.
444444
- [M3U IPTV](http://m3u-ip.tv/browser/)
445445
- [ArtPlayer](https://artplayer.org/?libs=https://cdnjs.cloudflare.com/ajax/libs/hls.js/1.5.17/hls.min.js&example=hls)
446+
- [IPTV Player](https://iptvplayer.stream), A free web-based HLS player that lets you play HLS,DASH and MP4 streams
446447
447448
### They use HLS.js in production!
448449

0 commit comments

Comments
 (0)