Skip to content

Commit 1107744

Browse files
authored
Merge branch 'master' into patch/v1.6.x
2 parents a3c63bd + 708e10f commit 1107744

38 files changed

+1259
-1432
lines changed

.eslintrc.js

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,11 @@ const asyncKeywordConstraintMsg =
33
const selfVsWindowGlobalMsg =
44
'Use `self` instead of `window` to access the global context everywhere (including workers).';
55
const arrayFindCompatibilityMsg =
6-
'Usage of Array find methods is restricted for compatibility.';
6+
'Usage of Array find method is restricted for compatibility.';
77
const arrayFindIndexCompatibilityMsg =
8-
'Usage of Array findIndex methods is restricted for compatibility.';
8+
'Usage of Array findIndex method is restricted for compatibility.';
9+
const arrayEveryCompatibilityMsg =
10+
'Usage of Array every method is restricted for compatibility. Use a negative Array some check instead.';
911

1012
module.exports = {
1113
env: { browser: true, commonjs: true, es6: true },
@@ -93,6 +95,11 @@ module.exports = {
9395
'MemberExpression[property.name="findIndex"][object.type="Identifier"]',
9496
message: arrayFindIndexCompatibilityMsg,
9597
},
98+
{
99+
selector:
100+
'MemberExpression[property.name="every"][object.type="Identifier"]',
101+
message: arrayEveryCompatibilityMsg,
102+
},
96103
],
97104
'import/order': [
98105
'warn',

.github/workflows/build.yml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ jobs:
5050
group: 'build:build:${{ github.ref }}'
5151
cancel-in-progress: true
5252
steps:
53-
- uses: actions/checkout@v4
53+
- uses: actions/checkout@v5
5454
with:
5555
fetch-depth: 0
5656

@@ -133,7 +133,7 @@ jobs:
133133
group: 'build:test_unit:${{ github.ref }}'
134134
cancel-in-progress: true
135135
steps:
136-
- uses: actions/checkout@v4
136+
- uses: actions/checkout@v5
137137

138138
- name: cache node_modules
139139
uses: actions/cache@v4
@@ -153,7 +153,7 @@ jobs:
153153
node-version-file: '.node-version'
154154

155155
- name: download build
156-
uses: actions/download-artifact@v4
156+
uses: actions/download-artifact@v5
157157
with:
158158
name: build
159159

@@ -177,7 +177,7 @@ jobs:
177177
group: 'build:cloudflare_pages:${{ github.ref }}'
178178
cancel-in-progress: true
179179
steps:
180-
- uses: actions/checkout@v4
180+
- uses: actions/checkout@v5
181181

182182
- name: cache node_modules
183183
uses: actions/cache@v4
@@ -197,7 +197,7 @@ jobs:
197197
node-version-file: '.node-version'
198198

199199
- name: download build
200-
uses: actions/download-artifact@v4
200+
uses: actions/download-artifact@v5
201201
with:
202202
name: build
203203

@@ -252,15 +252,15 @@ jobs:
252252
permissions:
253253
contents: write
254254
steps:
255-
- uses: actions/checkout@v4
255+
- uses: actions/checkout@v5
256256

257257
- name: use Node.js
258258
uses: actions/setup-node@v4
259259
with:
260260
node-version-file: '.node-version'
261261

262262
- name: download build
263-
uses: actions/download-artifact@v4
263+
uses: actions/download-artifact@v5
264264
with:
265265
name: build
266266

@@ -288,7 +288,7 @@ jobs:
288288
permissions:
289289
id-token: write
290290
steps:
291-
- uses: actions/checkout@v4
291+
- uses: actions/checkout@v5
292292

293293
- name: cache node_modules
294294
uses: actions/cache@v4
@@ -308,7 +308,7 @@ jobs:
308308
node-version-file: '.node-version'
309309

310310
- name: download build
311-
uses: actions/download-artifact@v4
311+
uses: actions/download-artifact@v5
312312
with:
313313
name: build
314314

@@ -352,7 +352,7 @@ jobs:
352352
uaVersion: '75.0'
353353

354354
steps:
355-
- uses: actions/checkout@v4
355+
- uses: actions/checkout@v5
356356

357357
- name: cache node_modules
358358
uses: actions/cache@v4
@@ -372,7 +372,7 @@ jobs:
372372
node-version-file: '.node-version'
373373

374374
- name: download build
375-
uses: actions/download-artifact@v4
375+
uses: actions/download-artifact@v5
376376
with:
377377
name: build
378378

@@ -424,7 +424,7 @@ jobs:
424424
os: Windows 10
425425

426426
steps:
427-
- uses: actions/checkout@v4
427+
- uses: actions/checkout@v5
428428

429429
- name: cache node_modules
430430
uses: actions/cache@v4
@@ -444,7 +444,7 @@ jobs:
444444
node-version-file: '.node-version'
445445

446446
- name: download build
447-
uses: actions/download-artifact@v4
447+
uses: actions/download-artifact@v5
448448
with:
449449
name: build
450450

.github/workflows/codeql-analysis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626

2727
steps:
2828
- name: Checkout repository
29-
uses: actions/checkout@v4
29+
uses: actions/checkout@v5
3030

3131
- name: Initialize CodeQL
3232
uses: github/codeql-action/init@v3

.node-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
22.17.1
1+
22.18.0

api-extractor/report/hls.js.api.md

Lines changed: 17 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -99,8 +99,10 @@ export interface AssetListLoadedData {
9999
assetListResponse: AssetListJSON;
100100
// (undocumented)
101101
event: InterstitialEventWithAssetList;
102+
// Warning: (ae-forgotten-export) The symbol "NullableNetworkDetails" needs to be exported by the entry point hls.d.ts
103+
//
102104
// (undocumented)
103-
networkDetails: any;
105+
networkDetails: NullableNetworkDetails;
104106
}
105107

106108
// Warning: (ae-missing-release-tag) "AssetListLoadingData" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
@@ -1271,7 +1273,7 @@ export interface ErrorData {
12711273
// (undocumented)
12721274
mimeType?: string;
12731275
// (undocumented)
1274-
networkDetails?: any;
1276+
networkDetails?: NullableNetworkDetails;
12751277
// (undocumented)
12761278
parent?: PlaylistLevelType;
12771279
// (undocumented)
@@ -1719,7 +1721,7 @@ export interface FragLoadedData {
17191721
// (undocumented)
17201722
frag: Fragment;
17211723
// (undocumented)
1722-
networkDetails: unknown;
1724+
networkDetails: NullableNetworkDetails;
17231725
// (undocumented)
17241726
part: Part | null;
17251727
// (undocumented)
@@ -1745,7 +1747,7 @@ export interface FragLoadFailResult extends ErrorData {
17451747
// (undocumented)
17461748
frag: Fragment;
17471749
// (undocumented)
1748-
networkDetails: any;
1750+
networkDetails: NullableNetworkDetails;
17491751
// (undocumented)
17501752
part?: Part;
17511753
// (undocumented)
@@ -2992,7 +2994,7 @@ export class KeyLoader extends Logger implements ComponentAPI {
29922994
// (undocumented)
29932995
abort(type?: PlaylistLevelType): void;
29942996
// (undocumented)
2995-
createKeyLoadError(frag: Fragment, details: ErrorDetails | undefined, error: Error, networkDetails?: any, response?: {
2997+
createKeyLoadError(frag: Fragment, details: ErrorDetails | undefined, error: Error, networkDetails?: NullableNetworkDetails, response?: {
29962998
url: string;
29972999
data: undefined;
29983000
code: number;
@@ -3401,7 +3403,7 @@ export interface LevelLoadedData {
34013403
// (undocumented)
34023404
levelInfo: Level;
34033405
// (undocumented)
3404-
networkDetails: any;
3406+
networkDetails: NullableNetworkDetails;
34053407
// (undocumented)
34063408
stats: LoaderStats;
34073409
// (undocumented)
@@ -3643,30 +3645,30 @@ export interface LoaderContext {
36433645
// Warning: (ae-missing-release-tag) "LoaderOnAbort" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
36443646
//
36453647
// @public (undocumented)
3646-
export type LoaderOnAbort<T extends LoaderContext> = (stats: LoaderStats, context: T, networkDetails: any) => void;
3648+
export type LoaderOnAbort<T extends LoaderContext> = (stats: LoaderStats, context: T, networkDetails: NullableNetworkDetails) => void;
36473649

36483650
// Warning: (ae-missing-release-tag) "LoaderOnError" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
36493651
//
36503652
// @public (undocumented)
36513653
export type LoaderOnError<T extends LoaderContext> = (error: {
36523654
code: number;
36533655
text: string;
3654-
}, context: T, networkDetails: any, stats: LoaderStats) => void;
3656+
}, context: T, networkDetails: NullableNetworkDetails, stats: LoaderStats) => void;
36553657

36563658
// Warning: (ae-missing-release-tag) "LoaderOnProgress" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
36573659
//
36583660
// @public (undocumented)
3659-
export type LoaderOnProgress<T extends LoaderContext> = (stats: LoaderStats, context: T, data: string | ArrayBuffer, networkDetails: any) => void;
3661+
export type LoaderOnProgress<T extends LoaderContext> = (stats: LoaderStats, context: T, data: string | ArrayBuffer, networkDetails: NullableNetworkDetails) => void;
36603662

36613663
// Warning: (ae-missing-release-tag) "LoaderOnSuccess" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
36623664
//
36633665
// @public (undocumented)
3664-
export type LoaderOnSuccess<T extends LoaderContext> = (response: LoaderResponse, stats: LoaderStats, context: T, networkDetails: any) => void;
3666+
export type LoaderOnSuccess<T extends LoaderContext> = (response: LoaderResponse, stats: LoaderStats, context: T, networkDetails: NullableNetworkDetails) => void;
36653667

36663668
// Warning: (ae-missing-release-tag) "LoaderOnTimeout" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
36673669
//
36683670
// @public (undocumented)
3669-
export type LoaderOnTimeout<T extends LoaderContext> = (stats: LoaderStats, context: T, networkDetails: any) => void;
3671+
export type LoaderOnTimeout<T extends LoaderContext> = (stats: LoaderStats, context: T, networkDetails: NullableNetworkDetails) => void;
36703672

36713673
// Warning: (ae-missing-release-tag) "LoaderResponse" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
36723674
//
@@ -3815,7 +3817,7 @@ export interface ManifestLoadedData {
38153817
// (undocumented)
38163818
levels: LevelParsed[];
38173819
// (undocumented)
3818-
networkDetails: any;
3820+
networkDetails: NullableNetworkDetails;
38193821
// (undocumented)
38203822
sessionData: Record<string, AttrList> | null;
38213823
// (undocumented)
@@ -4021,7 +4023,6 @@ export interface MediaKeySessionContext {
40214023
export type MediaOverrides = {
40224024
duration?: number;
40234025
endOfStream?: boolean;
4024-
cueRemoval?: boolean;
40254026
};
40264027

40274028
// Warning: (ae-missing-release-tag) "MediaPlaylist" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
@@ -4063,6 +4064,8 @@ export interface MediaPlaylist {
40634064
// (undocumented)
40644065
textCodec?: string;
40654066
// (undocumented)
4067+
trackNode?: HTMLTrackElement;
4068+
// (undocumented)
40664069
type: MediaPlaylistType | 'main';
40674070
// (undocumented)
40684071
unknownCodecs?: string[];
@@ -4848,7 +4851,7 @@ export interface TrackLoadedData {
48484851
// (undocumented)
48494852
id: number;
48504853
// (undocumented)
4851-
networkDetails: any;
4854+
networkDetails: NullableNetworkDetails;
48524855
// (undocumented)
48534856
stats: LoaderStats;
48544857
// (undocumented)

0 commit comments

Comments
 (0)