Skip to content

Commit cedd002

Browse files
authored
Merge branch 'master' into fmp4-flac
2 parents 17c2b88 + b0d908b commit cedd002

File tree

123 files changed

+27344
-28927
lines changed

Some content is hidden

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

123 files changed

+27344
-28927
lines changed

.esdoc.json

-18
This file was deleted.

.eslintrc.js

+2
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ module.exports = {
1414
__USE_ALT_AUDIO__: true,
1515
__USE_EME_DRM__: true,
1616
__USE_CMCD__: true,
17+
__USE_CONTENT_STEERING__: true,
18+
__USE_VARIABLE_SUBSTITUTION__: true,
1719
},
1820
// see https://github.com/standard/eslint-config-standard
1921
// 'prettier' (https://github.com/prettier/eslint-config-prettier) must be last

.github/stale.yml

+6-3
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,21 @@
11
# Number of days of inactivity before an issue becomes stale
2-
daysUntilStale: 21
2+
daysUntilStale: 18
33

44
# Number of days of inactivity before a stale issue is closed
5-
daysUntilClose: 3
5+
daysUntilClose: 7
66

77
# Issues with these labels will never be considered stale
88
exemptLabels:
99
- pinned
1010
- security
11+
- good-first-issue
12+
- Browser issue
13+
- CI
1114
- Confirmed
1215
- Chore
1316
- Enhancement
1417
- Feature proposal
15-
- Question
18+
- Missing Feature
1619
- Needs Triage
1720

1821
# Set to true to ignore issues in a project (defaults to false)

.github/workflows/automerge.yml

+1-2
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,7 @@ jobs:
1111
run:
1212
runs-on: ubuntu-latest
1313
steps:
14-
- uses: tjenkinson/gh-action-auto-merge-dependency-updates@d4c15028ca52e985ee3dfbb5ed263c510ad07025
14+
- uses: tjenkinson/gh-action-auto-merge-dependency-updates@b2d85843a11a4075ea396c995a677a5ca1ba5c19
1515
with:
1616
repo-token: ${{ secrets.CI_GITHUB_TOKEN }}
1717
allowed-actors: renovate[bot]
18-
package-block-list: netlify-cli

.github/workflows/build.yml

+27-19
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,10 @@ on:
88

99
permissions: {}
1010

11+
defaults:
12+
run:
13+
shell: bash
14+
1115
jobs:
1216
config:
1317
runs-on: ubuntu-latest
@@ -75,11 +79,11 @@ jobs:
7579
- name: use Node.js
7680
uses: actions/setup-node@v3
7781
with:
78-
node-version: '16'
82+
node-version-file: '.node-version'
7983

8084
- name: install
8185
run: |
82-
npm ci
86+
npx -y npm-ci-please@^1.1.1
8387
env:
8488
CI: true
8589

@@ -90,7 +94,7 @@ jobs:
9094
9195
- name: set version
9296
run: |
93-
node ./scripts/set-package-version.js
97+
./scripts/set-package-version.sh
9498
env:
9599
CI: true
96100
TAG: ${{ needs.config.outputs.tag }}
@@ -99,6 +103,8 @@ jobs:
99103
run: |
100104
npm run build:ci
101105
npm run docs
106+
./scripts/check-docs-built.sh
107+
102108
# check that hls.js doesn't error if requiring in node
103109
# see https://github.com/video-dev/hls.js/pull/1642
104110
node -e 'require("./" + require("./package.json").main)'
@@ -109,10 +115,12 @@ jobs:
109115
uses: actions/upload-artifact@v3
110116
with:
111117
name: build
118+
# version number is set in package.json so need to include that
112119
path: |
113-
**
114-
!**/[.]*/**
115-
!**/node_modules/
120+
package.json
121+
package-lock.json
122+
api-docs/**
123+
dist/**
116124
117125
test_unit:
118126
needs: build
@@ -135,7 +143,7 @@ jobs:
135143
- name: use Node.js
136144
uses: actions/setup-node@v3
137145
with:
138-
node-version: '16'
146+
node-version-file: '.node-version'
139147

140148
- name: download build
141149
uses: actions/download-artifact@v3
@@ -144,7 +152,7 @@ jobs:
144152

145153
- name: install
146154
run: |
147-
npm ci
155+
npx -y npm-ci-please@^1.1.1
148156
env:
149157
CI: true
150158

@@ -176,7 +184,7 @@ jobs:
176184
- name: use Node.js
177185
uses: actions/setup-node@v3
178186
with:
179-
node-version: '16'
187+
node-version-file: '.node-version'
180188

181189
- name: download build
182190
uses: actions/download-artifact@v3
@@ -185,7 +193,7 @@ jobs:
185193

186194
- name: install
187195
run: |
188-
npm ci
196+
npx -y npm-ci-please@^1.1.1
189197
env:
190198
CI: true
191199

@@ -233,7 +241,7 @@ jobs:
233241
- name: use Node.js
234242
uses: actions/setup-node@v3
235243
with:
236-
node-version: '16'
244+
node-version-file: '.node-version'
237245

238246
- name: download build
239247
uses: actions/download-artifact@v3
@@ -276,7 +284,7 @@ jobs:
276284
- name: use Node.js
277285
uses: actions/setup-node@v3
278286
with:
279-
node-version: '16'
287+
node-version-file: '.node-version'
280288

281289
- name: download build
282290
uses: actions/download-artifact@v3
@@ -285,7 +293,7 @@ jobs:
285293

286294
- name: install
287295
run: |
288-
npm ci
296+
npx -y npm-ci-please@^1.1.1
289297
env:
290298
CI: true
291299

@@ -330,15 +338,15 @@ jobs:
330338
- name: use Node.js
331339
uses: actions/setup-node@v3
332340
with:
333-
node-version: '16'
341+
node-version-file: '.node-version'
334342

335343
- name: download build
336344
uses: actions/download-artifact@v3
337345
with:
338346
name: build
339347

340348
- name: start SauceConnect tunnel
341-
uses: tjenkinson/sauce-connect-action@cb0550b782d59960a9864e3629a619fde1cb2c74
349+
uses: saucelabs/sauce-connect-action@7b93bae049e2f30e1b97627e257e529c7537afe9
342350
with:
343351
username: ${{ secrets.SAUCE_USERNAME }}
344352
accessKey: ${{ secrets.SAUCE_ACCESS_KEY }}
@@ -347,7 +355,7 @@ jobs:
347355

348356
- name: install
349357
run: |
350-
npm ci
358+
npx -y npm-ci-please@^1.1.1
351359
env:
352360
CI: true
353361

@@ -412,15 +420,15 @@ jobs:
412420
- name: use Node.js
413421
uses: actions/setup-node@v3
414422
with:
415-
node-version: '16'
423+
node-version-file: '.node-version'
416424

417425
- name: download build
418426
uses: actions/download-artifact@v3
419427
with:
420428
name: build
421429

422430
- name: start SauceConnect tunnel
423-
uses: tjenkinson/sauce-connect-action@cb0550b782d59960a9864e3629a619fde1cb2c74
431+
uses: saucelabs/sauce-connect-action@7b93bae049e2f30e1b97627e257e529c7537afe9
424432
with:
425433
username: ${{ secrets.SAUCE_USERNAME }}
426434
accessKey: ${{ secrets.SAUCE_ACCESS_KEY }}
@@ -429,7 +437,7 @@ jobs:
429437

430438
- name: install
431439
run: |
432-
npm ci
440+
npx -y npm-ci-please@^1.1.1
433441
env:
434442
CI: true
435443

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ coverage/
2121
/dist.zip
2222
/netlify
2323
/api-docs
24+
/api-docs-markdown
2425

2526
# eslint
2627
.eslintcache

.node-version

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
18

CONTRIBUTING.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ Please review the project [Code of Conduct](https://github.com/video-dev/hls.js/
1717

1818
First, if you found an issue, **ensure the bug was not already reported** by searching on GitHub under [Issues](https://github.com/video-dev/hls.js/issues).
1919

20-
If you're unable to find an open issue addressing the problem, open a new one using the [bug report template](https://github.com/video-dev/hls.js/issues/new?template=bug_report.md). As part of your issue, make sure to include:
20+
If you're unable to find an open issue addressing the problem, open a new one using the [bug report template](https://github.com/video-dev/hls.js/issues/new?template=bug.yaml). As part of your issue, make sure to include:
2121

2222
- Test stream/page (if possible)
2323
- hls.js configuration
@@ -31,7 +31,7 @@ If the issue is related to your stream, and you cannot share the stream, please
3131

3232
## Feature Requests
3333

34-
File feature requests using the [Feature request template](https://github.com/video-dev/hls.js/issues/new?assignees=&labels=&template=feature_request.md) filling out all parts.
34+
File feature requests using the [Feature request template](https://github.com/video-dev/hls.js/issues/new?assignees=&labels=&template=feature.yaml) filling out all parts.
3535

3636
Like with bug reports, please be as detailed as possible and try to make sure other contributors have everything they need to understand your request and how it will improve the project.
3737

0 commit comments

Comments
 (0)