Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/video-dev/hls.js
Browse files Browse the repository at this point in the history
* 'master' of https://github.com/video-dev/hls.js: (327 commits)
  [skip netlify] Update dependency netlify-cli to v3.21.9
  [skip netlify] Update dependency netlify-cli to v3.21.8
  [skip netlify] Update dependency eslint to v7.25.0
  [skip netlify] Update dependency netlify-cli to v3.21.7
  [skip netlify] Update dependency netlify-cli to v3.21.5
  [skip netlify] Update dependency netlify-cli to v3.21.3
  [skip netlify] Update dependency netlify-cli to v3.21.2
  [skip netlify] Update actions/github-script action to v4 (video-dev#3809)
  [skip netlify] Update dependency netlify-cli to v3.21.1
  [skip netlify] Update dependency netlify-cli to v3.21.0
  [skip netlify] Update babel monorepo to v7.13.16
  [skip netlify] Update dependency netlify-cli to v3.20.1
  [skip netlify] Update dependency netlify-cli to v3.19.1
  [skip netlify] Update dependency @microsoft/api-extractor to v7.14.0
  Fix fetch loader stats marked as aborted after loaded Fixes video-dev#3789
  Evict unbuffered audio and main fragments from the tracker on BUFFER_FLUSHED Resolves video-dev#3770
  Fix setInterval/Timer regression in fps-controller Fixes video-dev#3790
  [skip netlify] Update dependency netlify-cli to v3.19.0
  [skip netlify] Lock file maintenance
  [skip netlify] Lock file maintenance
  ...

# Conflicts:
#	.gitignore
  • Loading branch information
amiznikov committed Apr 24, 2021
2 parents 574c6d1 + 0e75fb6 commit ca29765
Show file tree
Hide file tree
Showing 138 changed files with 19,921 additions and 11,970 deletions.
7 changes: 6 additions & 1 deletion .eslintrc.js
Expand Up @@ -79,7 +79,12 @@ module.exports = {
'no-unused-vars': 0,
'no-undef': 0,
'no-use-before-define': 'off',
'@typescript-eslint/no-unused-vars': 'warn',
'@typescript-eslint/no-unused-vars': [
'warn',
{
args: 'none',
},
],
'@typescript-eslint/prefer-optional-chain': 2,
'@typescript-eslint/consistent-type-assertions': [
2,
Expand Down
31 changes: 0 additions & 31 deletions .github/CONTRIBUTING.md

This file was deleted.

15 changes: 13 additions & 2 deletions .github/ISSUE_TEMPLATE/bug_report.md
Expand Up @@ -5,13 +5,24 @@ about: Create a report to help us improve

### What version of Hls.js are you using?

### What browser and OS are you using?
### What browser and OS (including versions) are you using?

### Test stream:

<!-- If possible, please provide a test stream or page -->
<!-- You can paste your stream into the demo and provide the permalink here -->

### Configuration:

<!-- Describe the hls.js configuration and any additional player setup steps -->

```
{
"debug": false,
"backBufferLength": 60
}
```

### Checklist

<!-- Replace [ ] with [x] to check off the list -->
Expand Down Expand Up @@ -40,7 +51,7 @@ _What actually happened_
### Console output

```
Paste the contents of the browser console here.
Paste the contents of the browser console here (with `debug` enabled in your config).
```

```
Expand Down
11 changes: 0 additions & 11 deletions .github/dependabot.yml

This file was deleted.

21 changes: 3 additions & 18 deletions .github/workflows/automerge.yml
@@ -1,28 +1,13 @@
name: Auto Merge Dependency Updates

on:
- pull_request
- pull_request_target

jobs:
config:
runs-on: ubuntu-latest
outputs:
hasSecret: ${{ steps.check_secret_access.outputs.result == 'true' }}
steps:
- name: check secret access
id: check_secret_access
run: |
if ! [[ -z "$SECRET" ]]; then
echo "::set-output name=result::true"
fi
env:
SECRET: ${{ secrets.CI_GITHUB_TOKEN }}
run:
needs: config
if: needs.config.outputs.hasSecret == 'true'
runs-on: ubuntu-latest
steps:
- uses: tjenkinson/gh-action-auto-merge-dependency-updates@1ff3f19
- uses: tjenkinson/gh-action-auto-merge-dependency-updates@791110cb91cf883fb4894ffd080ddbe36607cd31
with:
repo-token: ${{ secrets.CI_GITHUB_TOKEN }}
allowed-actors: dependabot[bot]
allowed-actors: renovate[bot]
53 changes: 34 additions & 19 deletions .github/workflows/build.yml
Expand Up @@ -26,7 +26,7 @@ jobs:
SAUCE_ACCESS_KEY: ${{ secrets.SAUCE_ACCESS_KEY }}
- name: extract tag
id: extract_tag
uses: actions/github-script@v3
uses: actions/github-script@v4
with:
script: |
const prefix = 'refs/tags/';
Expand All @@ -43,6 +43,21 @@ jobs:
with:
fetch-depth: 0

- name: check package-lock.json version
id: extract_tag
uses: actions/github-script@v4
with:
script: |
const fs = require('fs');
if (
JSON.parse(fs.readFileSync('./package-lock.json', { encoding: 'utf8' }))
.lockfileVersion !== 2
) {
throw new Error(
'Expecting package-lock.json version to be 2. Please make sure you are using npm 7.'
);
}
- name: cache node_modules
uses: actions/cache@v2
env:
Expand All @@ -56,9 +71,9 @@ jobs:
${{ runner.os }}-
- name: use Node.js
uses: actions/setup-node@v1
uses: actions/setup-node@v2
with:
node-version: '12'
node-version: '15'

- name: install
run: |
Expand All @@ -80,8 +95,7 @@ jobs:

- name: build
run: |
npm run type-check
npm run build
npm run build:ci
npm run docs
# check that hls.js doesn't error if requiring in node
# see https://github.com/video-dev/hls.js/pull/1642
Expand Down Expand Up @@ -117,9 +131,9 @@ jobs:
${{ runner.os }}-
- name: use Node.js
uses: actions/setup-node@v1
uses: actions/setup-node@v2
with:
node-version: '12'
node-version: '15'

- name: download build
uses: actions/download-artifact@v2
Expand Down Expand Up @@ -158,9 +172,9 @@ jobs:
${{ runner.os }}-
- name: use Node.js
uses: actions/setup-node@v1
uses: actions/setup-node@v2
with:
node-version: '12'
node-version: '15'

- name: download build
uses: actions/download-artifact@v2
Expand Down Expand Up @@ -195,9 +209,9 @@ jobs:
- uses: actions/checkout@v2

- name: use Node.js
uses: actions/setup-node@v1
uses: actions/setup-node@v2
with:
node-version: '12'
node-version: '15'

- name: download build
uses: actions/download-artifact@v2
Expand Down Expand Up @@ -248,9 +262,9 @@ jobs:
${{ runner.os }}-
- name: use Node.js
uses: actions/setup-node@v1
uses: actions/setup-node@v2
with:
node-version: '12'
node-version: '15'

- name: download build
uses: actions/download-artifact@v2
Expand Down Expand Up @@ -302,17 +316,17 @@ jobs:
${{ runner.os }}-
- name: use Node.js
uses: actions/setup-node@v1
uses: actions/setup-node@v2
with:
node-version: '12'
node-version: '15'

- name: download build
uses: actions/download-artifact@v2
with:
name: build

- name: start SauceConnect tunnel
uses: saucelabs/sauce-connect-action@5c0cf29
uses: saucelabs/sauce-connect-action@5c0cf29805c7fe68f2dec68c6384332fb1ba73f9
with:
username: ${{ secrets.SAUCE_USERNAME }}
accessKey: ${{ secrets.SAUCE_ACCESS_KEY }}
Expand All @@ -328,6 +342,7 @@ jobs:
- name: run functional tests
run: |
npm run test:func
npm run test:func:light
env:
CI: true
SAUCE_TUNNEL_ID: ${{ github.run_id }}-${{ matrix.config }}
Expand Down Expand Up @@ -392,17 +407,17 @@ jobs:
${{ runner.os }}-
- name: use Node.js
uses: actions/setup-node@v1
uses: actions/setup-node@v2
with:
node-version: '12'
node-version: '15'

- name: download build
uses: actions/download-artifact@v2
with:
name: build

- name: start SauceConnect tunnel
uses: saucelabs/sauce-connect-action@5c0cf29
uses: saucelabs/sauce-connect-action@5c0cf29805c7fe68f2dec68c6384332fb1ba73f9
with:
username: ${{ secrets.SAUCE_USERNAME }}
accessKey: ${{ secrets.SAUCE_ACCESS_KEY }}
Expand Down
14 changes: 14 additions & 0 deletions .github/workflows/cancel.yml
@@ -0,0 +1,14 @@
name: Cancel
on:
workflow_run:
workflows: ['automerge', 'build', 'codeql-analysis']
types:
- requested
jobs:
cancel:
runs-on: ubuntu-latest
steps:
- uses: styfle/cancel-workflow-action@3d86a7cc43670094ac248017207be0295edbc31d
name: Cancel Previous Workflow Runs
with:
workflow_id: ${{ github.event.workflow.id }}
16 changes: 16 additions & 0 deletions .gitignore
Expand Up @@ -16,9 +16,25 @@ coverage/
.idea/*

# Build
/lib
# /dist
/dist.zip
/netlify
/api-docs

# eslint
.eslintcache

# Visual Studio 2015/2017 cache/options directory
.vs/

# Visual Studio 2017 auto generated files
Generated\ Files/

/web.config
/vwd.webinfo

# ReSharper is a .NET coding add-in
_ReSharper*/
*.[Rr]e[Ss]harper
*.DotSettings.user
1 change: 1 addition & 0 deletions .husky/.gitignore
@@ -0,0 +1 @@
_
5 changes: 3 additions & 2 deletions scripts/precommit.sh → .husky/pre-commit
@@ -1,5 +1,6 @@
#!/bin/bash
set -e
#!/bin/sh
. "$(dirname "$0")/_/husky.sh"

set -e
npm run lint:staged
npm run type-check
9 changes: 0 additions & 9 deletions .npmignore

This file was deleted.

9 changes: 6 additions & 3 deletions .prettierignore
@@ -1,5 +1,8 @@
/dist
/api-docs
package-lock.json
/api-extractor/report
/api-extractor/report-*
/coverage
libs/
/demo/libs
/dist
/lib
package-lock.json

0 comments on commit ca29765

Please sign in to comment.