Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(FEC-8212): support modular build process #265

Open
wants to merge 33 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
6076af2
feat(FEC-8212): support modular build process
OrenMe May 14, 2018
3001a23
unify ovp/ott config
OrenMe Jun 13, 2019
80f3df6
Merge branch 'master' of https://github.com/kaltura/kaltura-player-js…
OrenMe Jun 13, 2019
8d824f0
fixes
OrenMe Jun 14, 2019
9756ee1
fixes
OrenMe Jul 21, 2019
c12bb98
Merge branch 'master' into FEC-8212
OrenMe Jul 21, 2019
fb9f395
support managing OVP/OTT options and provider settings and add types
OrenMe Aug 5, 2019
067eac1
Merge branch 'master' into FEC-8212
OrenMe Aug 5, 2019
4a0acd1
tidy up package json
OrenMe Aug 7, 2019
3ebe6e1
clean dependencies
OrenMe Aug 7, 2019
954af6b
update yarn.lock
OrenMe Aug 7, 2019
a3a5adb
update provider deps and type
OrenMe Aug 7, 2019
922e82a
remove redundent provider type check
OrenMe Aug 7, 2019
28b4a7e
clean webpack config
OrenMe Aug 7, 2019
74a3124
support no UI mode
OrenMe Aug 11, 2019
dc278c0
fix poster bug and tests
OrenMe Aug 11, 2019
92dd8fe
karma config for local test with autoplay
OrenMe Aug 12, 2019
2c504e9
fix default poster selection logic
OrenMe Aug 12, 2019
9ff6e5a
fix tests, add stubs, reduce dependencies
OrenMe Aug 12, 2019
eb95d8e
lint
OrenMe Aug 12, 2019
c12845c
fix tests
OrenMe Aug 12, 2019
0e87bd1
fix flow
OrenMe Aug 12, 2019
35ddff7
add karma mocha reproter
OrenMe Aug 12, 2019
938ccd5
Revert "fix flow"
OrenMe Aug 13, 2019
bf08db2
fix flow
OrenMe Aug 13, 2019
ff2be82
fix tests
OrenMe Aug 13, 2019
0f2ba57
CR fixes
OrenMe Aug 13, 2019
2df63de
removed common/ott/ovp refs and directories
OrenMe Aug 26, 2019
1fb923d
remove common reference
OrenMe Aug 26, 2019
c7a3c55
remove unused flow mappings
OrenMe Aug 26, 2019
7e2fcf7
Merge branch 'master' of https://github.com/kaltura/kaltura-player-js…
OrenMe Aug 26, 2019
f899eed
update yarn.lock
OrenMe Aug 26, 2019
fe9d662
revert flow type move
OrenMe Aug 26, 2019
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 13 additions & 1 deletion .babelrc
Original file line number Diff line number Diff line change
@@ -1,6 +1,18 @@
{
"presets": [
"es2015"
[
"env",
{
"modules": false,
"useBuiltIns": true,
"targets": {
"browsers": [
">0.25%",
"not op_mini all"
]
}
}
]
],
"ignore": [
"node_modules/**/*"
Expand Down
1 change: 1 addition & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,4 @@ karma.conf.js
webpack.config.js
webpack.config.ovp.js
webpack.config.ott.js
src/cast/remote-player.js
1 change: 1 addition & 0 deletions .eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
"globals": {
"should": true,
"sinon": true,
"playkit": true,
"__VERSION__": true,
"__NAME__": true,
"__PACKAGE_URL__": true,
Expand Down
11 changes: 2 additions & 9 deletions .flowconfig
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,8 @@
[libs]
./src/index.js
node_modules/@playkit-js/playkit-js/flow-typed/
node_modules/@playkit-js/playkit-js-hls/flow-typed/
node_modules/@playkit-js/playkit-js-dash/flow-typed/
node_modules/@playkit-js/playkit-js-ui/flow-typed/
node_modules/playkit-js-providers/flow-typed/
node_modules/@playkit-js/core-provider/flow-typed/
node_modules/@playkit-js/core-provider/src/
[options]
unsafe.enable_getters_and_setters=true
module.name_mapper='playkit-js-providers' -> 'playkit-js-providers/dist/playkit-ovp-provider'
module.name_mapper='playkit-js-providers' -> 'playkit-js-providers/dist/playkit-ott-provider'
module.name_mapper='player-defaults' -> '<PROJECT_ROOT>/src/ovp/player-defaults'
module.name_mapper='player-defaults' -> '<PROJECT_ROOT>/src/ott/player-defaults'
module.name_mapper='poster' -> '<PROJECT_ROOT>/src/ovp/poster'
module.name_mapper='poster' -> '<PROJECT_ROOT>/src/ott/poster'
1 change: 1 addition & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,4 @@ yarn.lock
yarn-error.log
LICENSE
/samples
src/common/cast/remote-player.js
417 changes: 0 additions & 417 deletions dist/kaltura-ovp-player.js

This file was deleted.

1 change: 0 additions & 1 deletion dist/kaltura-ovp-player.js.map

This file was deleted.

422 changes: 0 additions & 422 deletions dist/kaltura-tv-player.js

This file was deleted.

1 change: 0 additions & 1 deletion dist/kaltura-tv-player.js.map

This file was deleted.

28 changes: 14 additions & 14 deletions docs/ads.md
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ if (player.ads.isAdBreak()) {
## Ad Events Timeline

During ad playback, there are events that get triggered to indicate the current ad state or state changes.
Some events are life cycle indicators and will always get triggered, while others are reactive to specific actions -- such as the user clicking the ad -- and may or may not be triggered.
Some events are life cycle indicators and will always get triggered, while others are reactive to specific actions -- such as the user clicking the ad -- and may or may not be triggered.

In the following diagram you can observe the events timeline from the point that an ad break starts to the point that the ad break ends.

Expand Down Expand Up @@ -112,8 +112,8 @@ You can observe the following timeline diagram that simulates these events' exac
> Fires when the ad manifest has been loaded and the ad layout is available.
> <br><br>_payload parameters:_
>
> | Name | Type | Description |
> | ------------------ | --------------- | ---------------------------------------------------------------- |
> | Name | Type | Description |
> | ------------------ | --------------- | ------------------------------------------------------------------- |
> | `adBreaksPosition` | `Array<number>` | An array that represents the ad break's time on the media timeline. |

#
Expand All @@ -123,8 +123,8 @@ You can observe the following timeline diagram that simulates these events' exac
> Fires when an ad has been loaded and ad data is available.
> <br><br>_payload parameters:_
>
> | Name | Type | Description |
> | ---- | ----------- | ------------ |
> | Name | Type | Description |
> | ---- | ----------- | ----------- |
> | `ad` | [`Ad`](#Ad) | The ad data |

#
Expand All @@ -134,8 +134,8 @@ You can observe the following timeline diagram that simulates these events' exac
> Fires when an ad has been started and ad data is available.
> <br><br>_payload parameters:_
>
> | Name | Type | Description |
> | ---- | ----------- | ------------ |
> | Name | Type | Description |
> | ---- | ----------- | ----------- |
> | `ad` | [`Ad`](#Ad) | The ad data |

#
Expand Down Expand Up @@ -177,9 +177,9 @@ You can observe the following timeline diagram that simulates these events' exac
>
> | Name | Type | Description |
> | ---------- | -------- | --------------------------------------------------------------------------- |
> | `severity` | `string` | The error severity |
> | `category` | `string` | The error category |
> | `code` | `number` | The error code |
> | `severity` | `string` | The error severity |
> | `category` | `string` | The error category |
> | `code` | `number` | The error code |
> | `data` | `Object` | The error data: the original ad error can be accessed by `data.innerError`. |

#
Expand All @@ -195,8 +195,8 @@ You can observe the following timeline diagram that simulates these events' exac
> Fires before an ad break is about to start.
> <br><br>_payload parameters:_
>
> | Name | Type | Description |
> | --------- | --------------------- | ------------------ |
> | Name | Type | Description |
> | --------- | --------------------- | ----------------- |
> | `adBreaK` | [`AdBreak`](#AdBreak) | The ad break data |

#
Expand Down Expand Up @@ -248,8 +248,8 @@ You can observe the following timeline diagram that simulates these events' exac
> Fires on ad time progress.
> <br><br>_payload parameters:_
>
> | Name | Type | Description |
> | ------------ | ------------------ | --------------------- |
> | Name | Type | Description |
> | ------------ | ------------------ | -------------------- |
> | `adProgress` | `AdProgressObject` | The ad progress data |
>
> ###### Type `AdProgressObject`
Expand Down
Loading