Skip to content

Commit

Permalink
Merge branch 'master' into feature/v1.0.0
Browse files Browse the repository at this point in the history
* master: (29 commits)
  when audio level loaded, check if we already know that it's live
  on level load, check current level details as well as new when determining live-ness
  Sample AES decryption with 48 AVC Closes: #3102
  when audio level loaded, check if we already know that it's live
  chore(deps): Upgrading TypeScript to 4.0.3.
  Sample AES decryption with 48 AVC Closes: #3102
  Bump chart.js from 2.9.3 to 2.9.4
  Bump url-toolkit from 2.2.0 to 2.2.1
  Bump mocha from 8.1.3 to 8.2.0
  Bump @babel/core from 7.12.1 to 7.12.3
  Bump @babel/helper-module-imports from 7.10.4 to 7.12.1
  Bump @babel/plugin-proposal-class-properties from 7.10.4 to 7.12.1
  Bump @types/chai from 4.2.13 to 4.2.14
  Bump @babel/plugin-proposal-object-rest-spread from 7.11.0 to 7.12.1
  on level load, check current level details as well as new when determining live-ness
  Bump @babel/plugin-transform-object-assign from 7.10.4 to 7.12.1
  Bump @babel/core from 7.11.6 to 7.12.1
  Bump @babel/preset-typescript from 7.10.4 to 7.12.1
  Bump @babel/preset-env from 7.11.5 to 7.12.1
  Bump @babel/register from 7.11.5 to 7.12.1
  ...

# Conflicts:
#	.eslintrc.js
#	package-lock.json
#	package.json
#	src/config.ts
#	src/controller/audio-stream-controller.js
#	src/controller/buffer-controller.ts
#	src/controller/fragment-finders.ts
#	src/controller/stream-controller.js
#	src/controller/timeline-controller.ts
#	src/demux/sample-aes.js
#	src/loader/fragment.ts
#	src/loader/m3u8-parser.ts
#	src/remux/mp4-remuxer.ts
#	src/types/track.ts
#	src/utils/timescale-conversion.ts
#	tests/.eslintrc.js
  • Loading branch information
Rob Walch committed Oct 20, 2020
2 parents 12d5548 + d99640f commit 694aa19
Show file tree
Hide file tree
Showing 18 changed files with 834 additions and 648 deletions.
85 changes: 44 additions & 41 deletions .eslintrc.js
@@ -1,43 +1,43 @@
module.exports = {
'env': {
'browser': true,
'commonjs': true,
'es6': true
env: {
browser: true,
commonjs: true,
es6: true
},
'globals': {
globals: {
// Allowed globals
'console': true,
console: true,

// Compile-time defines
'__VERSION__': true,
'__USE_SUBTITLES__': true,
'__USE_ALT_AUDIO__': true,
'__USE_EME_DRM__': true
__VERSION__: true,
__USE_SUBTITLES__: true,
__USE_ALT_AUDIO__: true,
__USE_EME_DRM__: true
},
// see https://standardjs.com/
// see https://github.com/standard/eslint-config-standard
'extends': [
extends: [
'eslint:recommended',
'standard'
],
'parser': '@typescript-eslint/parser',
'parserOptions': {
'sourceType': 'module'
parser: '@typescript-eslint/parser',
parserOptions: {
sourceType: 'module'
},
'plugins': [
plugins: [
'@typescript-eslint'
],
'rules': {
rules: {
// our basic style rules
'semi': [
semi: [
'error',
'always'
],
'indent': [
indent: [
'error',
2
],
'quotes': [
quotes: [
'error',
'single'
],
Expand All @@ -47,14 +47,14 @@ module.exports = {
],
// spacing
'space-infix-ops': 2,
'space-unary-ops': [2, { 'words': true, 'nonwords': false }],
'space-unary-ops': [2, { words: true, nonwords: false }],
'space-in-parens': ['error', 'never'],
'keyword-spacing': [2, { 'before': true, 'after': true }],
'keyword-spacing': [2, { before: true, after: true }],
// enforce litteral objects on multiple lines
'block-spacing': 'error',
'curly': 2,
curly: 2,
'object-curly-spacing': ['error', 'always'],
'brace-style': ['error', '1tbs', { 'allowSingleLine': false }],
'brace-style': ['error', '1tbs', { allowSingleLine: false }],

// limit code block and line length
/*
Expand All @@ -75,26 +75,26 @@ module.exports = {

'no-restricted-globals': [2,
{
'name': 'window',
'message': 'Use `self` instead of `window` to access the global context everywhere (including workers).'
name: 'window',
message: 'Use `self` instead of `window` to access the global context everywhere (including workers).'
},
{
'name': 'SourceBuffer',
'message': 'Use `self.SourceBuffer`'
name: 'SourceBuffer',
message: 'Use `self.SourceBuffer`'
},
{
'name': 'setTimeout',
'message': 'Use `self.setTimeout`'
name: 'setTimeout',
message: 'Use `self.setTimeout`'
},
{
'name': 'setInterval',
'message': 'Use `self.setInterval`'
name: 'setInterval',
message: 'Use `self.setInterval`'
}
],

'no-restricted-properties': [2,
{ 'property': 'findIndex' }, // Intended to block usage of Array.prototype.findIndex
{ 'property': 'find' } // Intended to block usage of Array.prototype.find
{ property: 'findIndex' }, // Intended to block usage of Array.prototype.findIndex
{ property: 'find' } // Intended to block usage of Array.prototype.find
],

'standard/no-callback-literal': 1,
Expand All @@ -106,7 +106,7 @@ module.exports = {
'no-console': [
1,
{
"allow": ["assert"]
allow: ['assert']
}
],
'no-fallthrough': 1,
Expand All @@ -125,17 +125,20 @@ module.exports = {
'lines-between-class-members': 2,
'no-prototype-builtins': 0
},
'overrides': [
overrides: [
{
'files': ['*.ts'],
'rules': {
files: ['*.ts'],
rules: {
'no-unused-vars': 0,
'@typescript-eslint/no-unused-vars': [ 'error', { 'args': 'none' } ],
'no-undef': 0,
'no-use-before-define': 'off',
// '@typescript-eslint/no-use-before-define': ['error'],
'@typescript-eslint/no-unused-vars': ['error', { args: 'none' }],
'@typescript-eslint/prefer-optional-chain': 2,
'@typescript-eslint/consistent-type-assertions': [ 2,
'@typescript-eslint/consistent-type-assertions': [2,
{
'assertionStyle': 'as',
'objectLiteralTypeAssertions': 'never'
assertionStyle: 'as',
objectLiteralTypeAssertions: 'never'
}
]
}
Expand Down

0 comments on commit 694aa19

Please sign in to comment.