Skip to content

Commit

Permalink
Merge branch 'master' into FEC-13371
Browse files Browse the repository at this point in the history
# Conflicts:
#	dist/kaltura-ovp-player.cjs.js
#	dist/kaltura-ovp-player.cjs.js.map
#	dist/kaltura-ovp-player.js
#	dist/kaltura-ovp-player.js.map
#	dist/kaltura-tv-player.cjs.js
#	dist/kaltura-tv-player.cjs.js.map
#	dist/kaltura-tv-player.js
#	dist/kaltura-tv-player.js.map
#	dist/translations/de.i18n.json
#	dist/translations/en.i18n.json
#	dist/translations/es.i18n.json
#	dist/translations/fi.i18n.json
#	dist/translations/fr.i18n.json
#	dist/translations/fr_ca.i18n.json
#	dist/translations/it.i18n.json
#	dist/translations/ja.i18n.json
#	dist/translations/ko.i18n.json
#	dist/translations/nl.i18n.json
#	dist/translations/pt_br.i18n.json
#	dist/translations/ru.i18n.json
#	dist/translations/zh_cn.i18n.json
#	dist/translations/zh_tw.i18n.json
#	package.json
#	src/common/playlist/playlist-manager.ts
#	src/common/storage/storage-manager.ts
#	src/common/storage/storage-wrapper.ts
#	src/common/utils/setup-helpers.ts
#	src/index.js
#	tests/e2e/common/storage/storage-manager.spec.ts
#	tests/e2e/common/storage/storage-wrapper.spec.js
#	tests/e2e/setup.spec.js
#	types.d.ts
#	yarn.lock
  • Loading branch information
JonathanTGold committed Dec 18, 2023
2 parents 4f32ac2 + 4539371 commit e57b969
Show file tree
Hide file tree
Showing 32 changed files with 782 additions and 272 deletions.
155 changes: 155 additions & 0 deletions .github/workflows/update_dependencies.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,155 @@
## Update Kaltura-player dependencies
name: Manual update of @playkit-js dependencies

on:
workflow_dispatch:
inputs:
UPDATE-playkit-js:
description: 'playkit-js'
required: true
default: true
type: boolean
VERSION-playkit-js:
description: 'playkit-js version'
required: true
default: latest

UPDATE-playkit-js-ui:
description: 'playkit-js-ui'
required: true
default: true
type: boolean
VERSION-playkit-js-ui:
description: 'playkit-js-ui version'
required: true
default: latest

UPDATE-playkit-js-providers:
description: 'playkit-js-providers'
required: true
default: true
type: boolean
VERSION-playkit-js-providers:
description: 'js-providers version'
required: true
default: latest

UPDATE-playkit-js-dash:
description: 'playkit-js-dash'
required: true
default: true
type: boolean
VERSION-playkit-js-dash:
description: 'playkit-js-dash version'
required: true
default: latest

UPDATE-playkit-js-hls:
description: 'playkit-js-hls'
required: true
default: true
type: boolean
VERSION-playkit-js-hls:
description: 'playkit-js-hls version'
required: true
default: latest

jobs:
check_and_update_dependencies:
runs-on: ubuntu-latest

steps:
- name: Checkout
uses: actions/checkout@v3
with:
token: ${{ secrets.PLAYER_GITHUB_BOT_TOKEN }}

- name: Setup Git
run: |
git config --global user.email ${{ secrets.PLAYER_BOT_EMAIL }}
git config --global user.name ${{ secrets.PLAYER_BOT_USER }}
- name: Setup Node.js
uses: actions/setup-node@v4
with:
node-version: '16.x'

- name: Check updates Kaltura dependencies (branch - ${{ github.ref_name }})
run: |
# Define dependencies
kalturaDependencies=(
'{"name": "playkit-js", "package": "@playkit-js/playkit-js"}'
'{"name": "playkit-js-dash", "package": "@playkit-js/playkit-js-dash"}'
'{"name": "playkit-js-hls", "package": "@playkit-js/playkit-js-hls"}'
'{"name": "playkit-js-providers", "package": "@playkit-js/playkit-js-providers"}'
'{"name": "playkit-js-ui", "package": "@playkit-js/playkit-js-ui"}'
)
# Check and update a dependency
checkAndUpdateDependency() {
local dependencyName="$1"
local packageName="$2"
local currentVersion=$(jq -r ".dependencies.\"$packageName\"" package.json)
# Check if the dependency exists in package.json
if [[ "$currentVersion" != "null" ]]; then
# Save script inputs to local variable
local inputsJson="${{ toJson(github.event.inputs) }}"
local dependencyKey="UPDATE-$dependencyName"
local versionKey="VERSION-$dependencyName"
local checkedValue=$(echo $inputsJson | sed -n "s/.*$dependencyKey:\([^,}]*\).*/\1/p")
local versionValue=$(echo $inputsJson | sed -n "s/.*$versionKey:\([^,}]*\).*/\1/p")
# Trim leading and trailing spaces from checkedValue and versionValue
checkedValue=$(echo $checkedValue | xargs)
versionValue=$(echo $versionValue | xargs)
# Check if the dependency checked in script inputs
if [[ $checkedValue == "true" ]]; then
# Check and set version for update
local latestVersion
if [[ $versionValue == "null" ]]; then
echo "Input versino value is 'null'. Skipping update for $dependencyName"
elif [[ $versionValue == "latest" ]]; then
# Get the latest version of the package using npm
latestVersion=$(npm view "$packageName" version)
else
# Get version from script inputs
latestVersion=$versionValue
fi
# Update the package.json file only if the version has changed
if [[ "$currentVersion" != "$latestVersion" ]]; then
echo "Update $packageName from $currentVersion to version $latestVersion"
yarn add $packageName@$latestVersion --silent
echo "COMMIT_REQUIRED=true" >> $GITHUB_ENV
else
echo "Dependency $packageName already has same version: $latestVersion"
fi
else
echo "Update of depencency $dependencyName skiped (checkbox unchecked)"
fi
else
echo "No $packageName dependency found in package.json"
fi
}
for dependency in "${kalturaDependencies[@]}"; do
dependencyName=$(echo "$dependency" | jq -r ".name")
packageName=$(echo "$dependency" | jq -r ".package")
checkAndUpdateDependency "$dependencyName" "$packageName"
done
- name: Commit changes
if: env.COMMIT_REQUIRED == 'true'
uses: peter-evans/create-pull-request@v5
with:
title: 'chore: upgrade kaltura-player dependencies'
delete-branch: true
branch: 'upgrade-npm-dependencies-automated'
commit-message: 'chore: upgrade kaltura-player dependencies'
25 changes: 25 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,31 @@

All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.

### 3.17.4 (2023-12-07)

### 3.17.3 (2023-11-26)


### Bug Fixes

* update playkit-js-dash to [1.35.2](https://github.com/kaltura/playkit-js-dash/releases/tag/v1.35.2) ([9b36d5c](https://github.com/kaltura/kaltura-player-js/commit/9b36d5c9bd88b4b068cf5fdd6a75dab287dca4b7))

### 3.17.2 (2023-11-12)

### 3.17.1 (2023-11-12)


### Bug Fixes

* update playkit-js-ui to [0.77.10](https://github.com/kaltura/playkit-js-ui/releases/tag/v0.77.10) ([f74fe37](https://github.com/kaltura/kaltura-player-js/commit/f74fe37c2c21492cf53687443cdf4d484899a83c))

## 3.17.0 (2023-10-31)


### Features

* update playkit-js-providers to [2.39.6](https://github.com/kaltura/playkit-js-providers/releases/tag/v2.39.6) ([9a45880](https://github.com/kaltura/kaltura-player-js/commit/9a45880e78e8858960fe4ed8ed4b181a3430b6cb))

## 3.16.0 (2023-10-08)


Expand Down
61 changes: 61 additions & 0 deletions dist/kaltura-ovp-player.cjs.js

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions dist/kaltura-ovp-player.js.map

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions dist/kaltura-tv-player.js.map

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions dist/translations/de.i18n.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"de":{"controls":{"play":"Abspielen","pause":"Pause","language":"Sprache","settings":"Einstellungen","fullscreen":"Vollbild","fullscreenExit":"Vollbild beenden","rewind":"Zurückspulen","forward":"Vorspulen","vrStereo":"vrStereo","closedCaptionsOn":"Untertitel deaktivieren","closedCaptionsOff":"Untertitel aktivieren","live":"Live","mute":"Ton aus","unmute":"Ton an","next":"Weiter","prev":"Zurück","startOver":"Von vorne","pictureInPicture":"Bild im Bild","pictureInPictureExit":"Bild in Bild verlassen","pictureInPictureExpand":"Erweitern","logo":"Logo","seekBarSlider":"Suchleiste","readLess":"Weniger","readMore":"Mehr"},"unmute":{"unmute":"Ton an"},"copy":{"button":"URL kopieren"},"settings":{"title":"Einstellungen","audio":"Audio","quality":"Qualität","speed":"Geschwindigkeit","speedNormal":"Normal","qualityAuto":"Automatisch"},"captions":{"captions":"Untertitel","advanced_captions_settings":"Erweiterte Einstellungen für Untertitel"},"overlay":{"close":"Schließen"},"error":{"default_error":"Etwas ist schiefgegangen"},"ads":{"ad_notice":"Anzeige","learn_more":"Weitere Informationen","skip_ad":"Werbung überspringen","skip_in":"Überspringen in"},"cvaa":{"title":"Erweiterte Einstellungen für Untertitel","sample_caption_tag":"Beispiel {{number}}","sample_custom_caption_tag":"Benutzerdefinierte Untertitel","set_custom_caption":"Benutzerdefinierte Untertitel auswählen","edit_caption":"Untertitel bearbeiten","size_label":"Größe","font_color_label":"Schriftfarbe","font_family_label":"Schriftart","font_style_label":"Schriftstil","font_opacity_label":"Deckkraft","background_color_label":"Hintergrundfarbe","background_opacity_label":"Deckkraft Hintergrund","apply":"Übernehmen","caption_preview":"Untertitelvorschau"},"cast":{"play_on_tv":"Über Fernseher abspielen","disconnect_from_tv":"Verbindung zum Fernseher trennen","status":{"connecting_to":"Verbinden mit","connected_to":"Verbunden mit","playing_on":"Wiedergabe auf"}},"playlist":{"prev":"Zurück","next":"Weiter","up_next":"Als Nächstes","up_next_in":"Als Nächstes","cancel":"Abbrechen"},"pictureInPicture":{"overlay_text":"Wiedergabe im Bild-im-Bild-Modus"},"volume":{"muted_click_to_unmute":"Stummgeschaltet. Zum Aufheben der Stummschaltung klicken","volume_click_to_mute":"Lautstärke. Zum Stummschalten klicken","ten_percent":"zehn Prozent","twenty_percent":"zwanzig Prozent","thirty_percent":"dreißig Prozent","fourty_percent":"vierzig Prozent","fifty_percent":"fünfzig Prozent","sixty_percent":"sechzig Prozent","seventy_percent":"siebzig Prozent","eighty_percent":"achtzig Prozent","ninety_percent":"neunzig Prozent","one_hundred_percent":"hundert Prozent"}}}
1 change: 1 addition & 0 deletions dist/translations/en.i18n.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"en":{"controls":{"play":"Play","pause":"Pause","language":"Language","settings":"Settings","fullscreen":"Fullscreen","fullscreenExit":"Exit fullscreen","rewind":"Seek backwards","forward":"Seek forward","vrStereo":"vrStereo","closedCaptionsOn":"Disable Captions","closedCaptionsOff":"Enable Captions","live":"Live","mute":"Mute","unmute":"Unmute","next":"Next","prev":"Prev","startOver":"Start over","pictureInPicture":"Picture in picture","pictureInPictureExit":"Exit picture in picture","pictureInPictureExpand":"Expand","logo":"Logo","seekBarSlider":"Seek bar","readLess":"Less","readMore":"More"},"unmute":{"unmute":"Unmute"},"volume":{"muted_click_to_unmute":"Muted. Click to unmute","volume_click_to_mute":"{{vol}}% volume. Click to mute","ten_percent":"ten percent","twenty_percent":"twenty percent","thirty_percent":"thirty percent","fourty_percent":"forty percent","fifty_percent":"fifty percent","sixty_percent":"sixty percent","seventy_percent":"seventy percent","eighty_percent":"eighty percent","ninety_percent":"ninety percent","one_hundred_percent":"one hundred percent","volume_slider_aria_label":"Volume control, use the arrows to control the volume"},"copy":{"button":"Copy URL"},"settings":{"title":"Settings","audio":"Audio","quality":"Quality","speed":"Speed","speedNormal":"Normal","qualityAuto":"Auto","advancedAudioDescription":"Advanced Audio Description"},"captions":{"captions":"Captions","advanced_captions_settings":"Advanced captions settings"},"overlay":{"close":"Close"},"error":{"default_error":"Something went wrong","network_error":"No internet connection check your network","default_session_text":"Copy for customer care: session ID","retry":"Try again"},"ads":{"ad_notice":"Advertisement","learn_more":"Learn more","skip_ad":"Skip ad","skip_in":"Skip in"},"cvaa":{"title":"Advanced captions settings","sample_caption_tag":"Sample {{number}}","sample_custom_caption_tag":"Custom captions","set_custom_caption":"Set custom caption","edit_caption":"Edit caption","size_label":"Size","font_color_label":"Font color","font_family_label":"Font family","font_style_label":"Font style","font_opacity_label":"Font opacity","background_color_label":"Background color","background_opacity_label":"Background opacity","apply":"Apply","caption_preview":"This is your caption preview"},"cast":{"play_on_tv":"Play on TV","disconnect_from_tv":"Disconnect from TV","status":{"connecting_to":"Connecting to","connected_to":"Connected to","playing_on":"Playing on"}},"playlist":{"prev":"Previous","next":"Next","up_next":"Up Next","up_next_in":"Up next in","cancel":"Cancel"},"pictureInPicture":{"overlay_text":"Playing in Picture In Picture mode"},"watermark":{"watermark_alt_text":"Watermark"}}}
1 change: 1 addition & 0 deletions dist/translations/es.i18n.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"es":{"controls":{"play":"Reproducir","pause":"Pausar","language":"Idioma","settings":"Configuración","fullscreen":"Pantalla completa","fullscreenExit":"Salir del modo de pantalla completa","rewind":"Buscar hacia atrás","forward":"Buscar hacia delante","vrStereo":"vrStereo","closedCaptionsOn":"Desactivar subtítulos","closedCaptionsOff":"Activar subtítulos","live":"En directo","mute":"Silenciar","unmute":"Dejar de silenciar","next":"Siguiente","prev":"Anterior","startOver":"Volver a empezar","pictureInPicture":"Imagen dentro de la imagen","pictureInPictureExit":"Salir de imagen en imagen","pictureInPictureExpand":"Expandir","logo":"Logotipo","seekBarSlider":"Buscar control deslizante","readLess":"Menos","readMore":"Más"},"unmute":{"unmute":"Dejar de silenciar"},"copy":{"button":"Copiar URL"},"settings":{"title":"Configuración","quality":"Calidad","audio":"Audio","speed":"Velocidad","speedNormal":"Normal","qualityAuto":"Automático"},"captions":{"captions":"Subtítulos","advanced_captions_settings":"Configuración avanzada de los subtítulos"},"overlay":{"close":"Cerrar"},"error":{"default_error":"Algo salió mal."},"ads":{"ad_notice":"Anuncio","learn_more":"Más información","skip_ad":"Omitir anuncio","skip_in":"Saltar"},"cvaa":{"title":"Configuración avanzada de los subtítulos","sample_caption_tag":"Ejemplo {{number}}","sample_custom_caption_tag":"Personalizar subtítulos","set_custom_caption":"Configurar subtítulos personalizados","edit_caption":"Editar subtítulo","size_label":"Tamaño","font_color_label":"Color de la fuente","font_family_label":"Tipo de fuente","font_style_label":"Estilo de la fuente","font_opacity_label":"Opacidad de la fuente","background_color_label":"Color de fondo","background_opacity_label":"Opacidad del fondo","apply":"Aplicar","caption_preview":"Esta es la vista previa de su subtítulo"},"cast":{"play_on_tv":"Reproducir en TV","disconnect_from_tv":"Desconectar de TV","status":{"connecting_to":"Conectar a","connected_to":"Conectado a","playing_on":"Reproducido en"}},"playlist":{"prev":"Anterior","next":"Siguiente","up_next":"Siguiente","up_next_in":"Siguiente en","cancel":"Cancelar"},"pictureInPicture":{"overlay_text":"Reproducido en modo imagen dentro de la imagen"},"volume":{"muted_click_to_unmute":"Silenciado. Haga clic para activar el audio","volume_click_to_mute":"volumen. Haga clic para silenciar","ten_percent":"diez por ciento","twenty_percent":"veinte por ciento","thirty_percent":"treinta por ciento","fourty_percent":"cuarenta por ciento","fifty_percent":"cincuenta por ciento","sixty_percent":"sesenta por ciento","seventy_percent":"setenta por ciento","eighty_percent":"ochenta por ciento","ninety_percent":"noventa por ciento","one_hundred_percent":"cien por cien"}}}
1 change: 1 addition & 0 deletions dist/translations/fi.i18n.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"fi":{"controls":{"play":"Toista","pause":"Keskeytä","language":"Kieli","settings":"Asetukset","fullscreen":"Koko näyttö","fullscreenExit":"Poistu koko näytöltä","rewind":"Siirry taaksepäin","forward":"Siirry eteenpäin","vrStereo":"vrStereo","closedCaptionsOn":"Poista tekstitykset käytöstä","closedCaptionsOff":"Ota tekstitykset käyttöön","live":"Live","mute":"Mykistä","unmute":"Poista mykistys","next":"Seuraava","prev":"Edellinen","startOver":"Aloita uudelleen","pictureInPicture":"Kuva kuvassa","pictureInPictureExit":"Poistu kuva-kuvassa-toiminnosta","pictureInPictureExpand":"Laajenna","logo":"Logo","seekBarSlider":"Hae liukusäädin","readLess":"Vähemmän","readMore":"Lisää"},"unmute":{"unmute":"Poista mykistys"},"copy":{"button":"Kopioi URL"},"settings":{"title":"Asetukset","audio":"Ääni","quality":"Laatu","speed":"Nopeus","speedNormal":"Normaali","qualityAuto":"Automaattinen"},"captions":{"captions":"Tekstitykset","advanced_captions_settings":"Tekstityksen lisäasetukset"},"overlay":{"close":"Sulje"},"error":{"default_error":"Jokin meni pieleen"},"ads":{"ad_notice":"Mainos","learn_more":"Lisätietoja","skip_ad":"Ohita mainos","skip_in":"Ohita"},"cvaa":{"title":"Tekstityksen lisäasetukset","sample_caption_tag":"Esimerkki {{number}}","sample_custom_caption_tag":"Mukautetut tekstitykset","set_custom_caption":"Aseta mukautettu tekstitys","edit_caption":"Muokkaa tekstitystä","size_label":"Koko","font_color_label":"Fontin väri","font_family_label":"Fonttiperhe","font_style_label":"Fontin tyyli","font_opacity_label":"Fontin peittävyys","background_color_label":"Taustaväri","background_opacity_label":"Taustavärin peittävyys","apply":"Käytä","caption_preview":"Tämä on esikatselu tekstityksestäsi"},"cast":{"play_on_tv":"Toista TV:ssä","disconnect_from_tv":"Katkaise yhteys TV:hen","status":{"connecting_to":"Yhdistetään kohteeseen","connected_to":"Yhdistetty kohteeseen","playing_on":"Toistetaan kohteessa"}},"playlist":{"prev":"Edellinen","next":"Seuraava","up_next":"Seuraava","up_next_in":"Seuraavana","cancel":"Peruuta"},"pictureInPicture":{"overlay_text":"Toistetaan kuva kuvassa -tilassa"},"volume":{"muted_click_to_unmute":"Mykistetty. Klikkaa poistaaksesi mykistyksen","volume_click_to_mute":"äänenvoimakkuus. Klikkaa mykistääksesi","ten_percent":"kymmenen prosenttia","twenty_percent":"kaksikymmentä prosenttia","thirty_percent":"kolmekymmentä prosenttia","fourty_percent":"neljäkymmentä prosenttia","fifty_percent":"viisikymmentä prosenttia","sixty_percent":"kuusikymmentä prosenttia","seventy_percent":"seitsemänkymmentä prosenttia","eighty_percent":"kahdeksankymmentä prosenttia","ninety_percent":"yhdeksänkymmentä prosenttia","one_hundred_percent":"sata prosenttia"}}}
Loading

0 comments on commit e57b969

Please sign in to comment.