From 793a8be4a8881e495c7fadf3f66bfc845a3ced03 Mon Sep 17 00:00:00 2001 From: Gilad Nadav Date: Sun, 14 May 2023 18:28:18 +0300 Subject: [PATCH 1/2] fix(FEC-13123): replace travis with github actions (#23) FEC-13123 --- .flowconfig | 2 +- .github/workflows/run_canary_full_flow.yaml | 2 +- .github/workflows/run_prod.yaml | 2 +- .github/workflows/run_tests.yaml | 2 +- flow-typed/modules/kaltura-player-js.js | 2 +- package.json | 4 +- src/components/plugin-button/plugin-button.js | 2 +- src/components/share-overlay/share-overlay.js | 2 +- src/components/share/share.js | 2 +- src/index.js | 2 +- src/share.js | 2 +- webpack.config.js | 2 +- yarn.lock | 90 ++++++++++--------- 13 files changed, 59 insertions(+), 57 deletions(-) diff --git a/.flowconfig b/.flowconfig index 0f10ea6..d101f86 100644 --- a/.flowconfig +++ b/.flowconfig @@ -3,7 +3,7 @@ [include] [libs] node_modules/@playkit-js/playkit-js/flow-typed/ -node_modules/kaltura-player-js/flow-typed/ +node_modules/@playkit-js/kaltura-player-js/flow-typed/ [options] esproposal.decorators=ignore module.file_ext=.scss diff --git a/.github/workflows/run_canary_full_flow.yaml b/.github/workflows/run_canary_full_flow.yaml index d107029..a9662eb 100644 --- a/.github/workflows/run_canary_full_flow.yaml +++ b/.github/workflows/run_canary_full_flow.yaml @@ -24,4 +24,4 @@ jobs: type: "plugin" stage: "canary" schema-type: "playerV3Versions" - tests-yarn-run-to-execute: 'eslint flow test' + tests-yarn-run-to-execute: 'build eslint flow test' diff --git a/.github/workflows/run_prod.yaml b/.github/workflows/run_prod.yaml index b74800d..1da1ae9 100644 --- a/.github/workflows/run_prod.yaml +++ b/.github/workflows/run_prod.yaml @@ -21,4 +21,4 @@ jobs: type: "plugin" env: "prod" schema-type: "playerV3Versions" - tests-yarn-run-to-execute: 'eslint flow test' + tests-yarn-run-to-execute: 'build eslint flow test' diff --git a/.github/workflows/run_tests.yaml b/.github/workflows/run_tests.yaml index 182242c..b0c2fa3 100644 --- a/.github/workflows/run_tests.yaml +++ b/.github/workflows/run_tests.yaml @@ -11,7 +11,7 @@ jobs: running-tests: uses: kaltura/ovp-pipelines-pub/.github/workflows/player_tests.yaml@v1.0.0 with: - yarn-run-to-execute: 'eslint flow test' + yarn-run-to-execute: 'build eslint flow test' notification: if: always() uses: kaltura/ovp-pipelines-pub/.github/workflows/notification.yaml@v1.0.0 diff --git a/flow-typed/modules/kaltura-player-js.js b/flow-typed/modules/kaltura-player-js.js index e9732fb..954e891 100644 --- a/flow-typed/modules/kaltura-player-js.js +++ b/flow-typed/modules/kaltura-player-js.js @@ -1,4 +1,4 @@ // @flow -declare module 'kaltura-player-js' { +declare module '@playkit-js/kaltura-player-js' { declare module.exports: any; } diff --git a/package.json b/package.json index a4a9d5e..737305d 100644 --- a/package.json +++ b/package.json @@ -75,7 +75,7 @@ "flow-bin": "^0.129.0", "husky": "^4.2.5", "istanbul": "^0.4.5", - "kaltura-player-js": "https://github.com/kaltura/kaltura-player-js.git#master", + "@playkit-js/kaltura-player-js": "canary", "karma": "^5.1.0", "karma-chai": "^0.1.0", "karma-chrome-launcher": "^3.1.0", @@ -104,7 +104,7 @@ "webpack-dev-server": "^3.11.0" }, "peerDependencies": { - "kaltura-player-js": "https://github.com/kaltura/kaltura-player-js.git#master" + "@playkit-js/kaltura-player-js": "canary" }, "publishConfig": { "access": "public" diff --git a/src/components/plugin-button/plugin-button.js b/src/components/plugin-button/plugin-button.js index 3cef0ea..4f75818 100644 --- a/src/components/plugin-button/plugin-button.js +++ b/src/components/plugin-button/plugin-button.js @@ -3,7 +3,7 @@ * @jsx h * @ignore */ -import {ui} from 'kaltura-player-js'; +import {ui} from '@playkit-js/kaltura-player-js'; import {pluginName} from '../../share'; const {preact, preacti18n, Components, style} = ui; const {h, Component} = preact; diff --git a/src/components/share-overlay/share-overlay.js b/src/components/share-overlay/share-overlay.js index 397fc6f..0661d2a 100644 --- a/src/components/share-overlay/share-overlay.js +++ b/src/components/share-overlay/share-overlay.js @@ -3,7 +3,7 @@ * @jsx h * @ignore */ -import {ui} from 'kaltura-player-js'; +import {ui} from '@playkit-js/kaltura-player-js'; import shareStyle from './style.scss'; const {preact, preacti18n, Components, Event, Utils, style, redux, Reducers, preactHooks} = ui; diff --git a/src/components/share/share.js b/src/components/share/share.js index 30ad7e9..eada3fa 100644 --- a/src/components/share/share.js +++ b/src/components/share/share.js @@ -3,7 +3,7 @@ * @jsx h * @ignore */ -import {ui, core} from 'kaltura-player-js'; +import {ui, core} from '@playkit-js/kaltura-player-js'; import {ShareOverlay} from '../share-overlay/share-overlay'; const {preact, preacti18n, Components, Utils, redux, Reducers, createPortal} = ui; const {h, Component} = preact; diff --git a/src/index.js b/src/index.js index f374362..826bd9a 100644 --- a/src/index.js +++ b/src/index.js @@ -1,5 +1,5 @@ // @flow -import {registerPlugin} from 'kaltura-player-js'; +import {registerPlugin} from '@playkit-js/kaltura-player-js'; import {Share as Plugin, pluginName} from './share'; import {Share} from './components/share/share'; declare var __VERSION__: string; diff --git a/src/share.js b/src/share.js index 168b47a..b973ac6 100644 --- a/src/share.js +++ b/src/share.js @@ -4,7 +4,7 @@ * @ignore */ import {h} from 'preact'; -import {KalturaPlayer, BasePlugin, core, ui} from 'kaltura-player-js'; +import {KalturaPlayer, BasePlugin, core, ui} from '@playkit-js/kaltura-player-js'; import {ICON_PATH, Share as ShareComponent} from './components/share/share'; import {defaultShareOptionsConfig} from './default-share-options-config'; import {ShareButton} from './components/plugin-button/plugin-button'; diff --git a/webpack.config.js b/webpack.config.js index 31fb6be..9e9832c 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -82,6 +82,6 @@ module.exports = { modules: [path.resolve(__dirname, 'src'), 'node_modules'] }, externals: { - 'kaltura-player-js': ['KalturaPlayer'] + '@playkit-js/kaltura-player-js': ['KalturaPlayer'] } }; diff --git a/yarn.lock b/yarn.lock index 4250c56..88264ad 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1159,30 +1159,52 @@ resolved "https://registry.yarnpkg.com/@nicolo-ribaudo/chokidar-2/-/chokidar-2-2.1.8-no-fsevents.3.tgz#323d72dd25103d0c4fbdce89dadf574a787b1f9b" integrity sha512-s88O1aVtXftvp5bCPB7WnmXc5IwOZZ7YPuwNPt+GtOOXpPvad1LfbmjYv+qII7zP6RU2QGnqve27dnLycEnyEQ== -"@playkit-js/playkit-js-dash@1.31.4": - version "1.31.4" - resolved "https://registry.yarnpkg.com/@playkit-js/playkit-js-dash/-/playkit-js-dash-1.31.4.tgz#9bbfcc60b5124c2d46b4e7bf1aab3e1f08074b68" - integrity sha512-RhH7dDuOBS30Cr0N0deJyKxLm+pfkdZuno0MhVHbGJ0azk+quygzNDUGoqx37WxHfPv6UXKI3IENO/XaxObRfQ== +"@playkit-js/kaltura-player-js@canary": + version "3.14.3-canary.0-4128316" + resolved "https://registry.yarnpkg.com/@playkit-js/kaltura-player-js/-/kaltura-player-js-3.14.3-canary.0-4128316.tgz#0b0d07e9f06e92391afd84d5ac7219d476278299" + integrity sha512-QV4v6cOKsc+qUEIdTV4zJGHGRgkL9kr9YIhNJgWLCZvhEq5pw09kZ6gktp+QV7dEQ3YfknatTJOsMeVW3tmVpQ== + dependencies: + "@babel/polyfill" "^7.0.0" + "@playkit-js/playkit-js" "^0.82.3-canary.0-f0d3180" + "@playkit-js/playkit-js-dash" "^1.34.1-canary.0-9422826" + "@playkit-js/playkit-js-hls" "^1.32.3-canary.0-5a35881" + "@playkit-js/playkit-js-providers" "^2.39.3-canary.0-e04b57d" + "@playkit-js/playkit-js-ui" "^0.77.2-canary.0-ee0e6eb" + "@types/preact-i18n" "^2.3.1" + hls.js "1.3.5" + intersection-observer "^0.12.0" + proxy-polyfill "^0.3.0" + shaka-player "4.3.5" + +"@playkit-js/playkit-js-dash@^1.34.1-canary.0-9422826": + version "1.34.1" + resolved "https://registry.yarnpkg.com/@playkit-js/playkit-js-dash/-/playkit-js-dash-1.34.1.tgz#c57bab1c6c15336834601cc36fde5e5a93e7ec7b" + integrity sha512-oxRBuWJE4pTvYoH4qleMD3yDUXi2bt/D+9bUhrmsMPtYIfCUccYvNHKL3+YJwy9FjLBvHXmpYK91VDDRQrYf1Q== -"@playkit-js/playkit-js-hls@1.31.2": - version "1.31.2" - resolved "https://registry.yarnpkg.com/@playkit-js/playkit-js-hls/-/playkit-js-hls-1.31.2.tgz#2c7eb3d74be138bc450bbe0aada8a54e76b724f5" - integrity sha512-cSv6mgEfqb+V8aD71I6/wW2tiq3zMZFr7376DnjXgeeGww6je7YUxsar1FjbBcHa8kartj8cXSSX1VhnhuJZOg== +"@playkit-js/playkit-js-hls@^1.32.3-canary.0-5a35881": + version "1.32.3" + resolved "https://registry.yarnpkg.com/@playkit-js/playkit-js-hls/-/playkit-js-hls-1.32.3.tgz#285667bfbe6117e060502ab1d69b0f03d28e45f1" + integrity sha512-wwqCZQ1B3IGISYi0Lp91eGayvo3eMwoVcFssMKwdh19JBUS2r/nRkd+NQl1ozqqUGQRwD9hwdPnOiKkwzressw== -"@playkit-js/playkit-js-ui@canary": - version "0.74.0-canary.77ecb34" - resolved "https://registry.yarnpkg.com/@playkit-js/playkit-js-ui/-/playkit-js-ui-0.74.0-canary.77ecb34.tgz#743a59def90d23a661eb7a5ac7c8dcd50fbf7cde" - integrity sha512-QQ1bG21Mt4VMZawv4W/PKuX2lR/lL8toBhicmqlX1syn/3phXHLSxRQLwnL8L/kOTm9pP3voajGsOBongMvw4w== +"@playkit-js/playkit-js-providers@^2.39.3-canary.0-e04b57d": + version "2.39.3-canary.0-e04b57d" + resolved "https://registry.yarnpkg.com/@playkit-js/playkit-js-providers/-/playkit-js-providers-2.39.3-canary.0-e04b57d.tgz#055ba43c3f2f3b4c2fa0c72e8263ae8262226db3" + integrity sha512-d6EOT3YUyTP7V1u2roQNoPTY+kToHEkW8jo5+9cfOPLi0Cl7TtJ/loZls9KL4iVse4wIJK1WicpLf2xorYwLUw== + +"@playkit-js/playkit-js-ui@^0.77.2-canary.0-ee0e6eb": + version "0.77.2-canary.0-ee0e6eb" + resolved "https://registry.yarnpkg.com/@playkit-js/playkit-js-ui/-/playkit-js-ui-0.77.2-canary.0-ee0e6eb.tgz#e39ca4c16b8588e58d72b919092dff9f01900ef5" + integrity sha512-5uA7W1mhi7YGoZY7NhDr9WgXNxVmQOz0BON8WJIbBKGBtDQAERxefIUFQIK7jvBsH8Y4G0F0wcGbzovPOGLAbw== dependencies: preact "^10.3.4" preact-i18n "^2.0.0-preactx.2" react-redux "^7.2.0" redux "^4.0.5" -"@playkit-js/playkit-js@canary": - version "0.81.0-canary.d863b1b" - resolved "https://registry.yarnpkg.com/@playkit-js/playkit-js/-/playkit-js-0.81.0-canary.d863b1b.tgz#77d8b6e7203f00aacd0704b7ad919db40df739a1" - integrity sha512-hmETwKRcERgRz5lgu8d0KeVQ8t+rzSuUDD0rxUsAqQDWqjaTI2sD3nkGpflNm/rIb6AWHxmCp0PuXG+tBae5aQ== +"@playkit-js/playkit-js@^0.82.3-canary.0-f0d3180": + version "0.82.3-canary.0-f0d3180" + resolved "https://registry.yarnpkg.com/@playkit-js/playkit-js/-/playkit-js-0.82.3-canary.0-f0d3180.tgz#bd976cf382a38797a6c025d6bf654a62b1a8c086" + integrity sha512-3co6fH/2F3uOkxC1+3Of40fubl7qwzPa5zGwa8QSczwwNFnoovHVXi1MnNsTSvKmt7FJxFS+Lw+SzVknhSZhZA== dependencies: js-logger "^1.6.0" ua-parser-js "1.0.2" @@ -5312,10 +5334,10 @@ highlight.js@^10.7.2: resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-10.7.3.tgz#697272e3991356e40c3cac566a74eef681756531" integrity sha512-tzcUFauisWKNHaRkN4Wjl/ZA07gENAjFl3J/c480dprkGTg5EQstgaNFqBfUqCq54kZRIEcreTsAgF/m2quD7A== -hls.js@1.3.1: - version "1.3.1" - resolved "https://registry.yarnpkg.com/hls.js/-/hls.js-1.3.1.tgz#2e43949aeaee8f3d54cabd7c4c1a9a718a03e7c2" - integrity sha512-6f4Qyrfj9sNUWMzNFKruqeD2KdisOwQ1GQJqnWAgMQ1hequlFK7e2dmF9qQD3mF/RI76hvztCMBptlPb+HcDow== +hls.js@1.3.5: + version "1.3.5" + resolved "https://registry.yarnpkg.com/hls.js/-/hls.js-1.3.5.tgz#0e8b0799ecf2feb7ba199f5e95f35ba9552e04f4" + integrity sha512-uybAvKS6uDe0MnWNEPnO0krWVr+8m2R0hJ/viql8H3MVK+itq8gGQuIYoFHL3rECkIpNH98Lw8YuuWMKZxp3Ew== hmac-drbg@^1.0.1: version "1.0.1" @@ -6264,22 +6286,6 @@ just-extend@^4.0.2: resolved "https://registry.yarnpkg.com/just-extend/-/just-extend-4.2.1.tgz#ef5e589afb61e5d66b24eca749409a8939a8c744" integrity sha512-g3UB796vUFIY90VIv/WX3L2c8CS2MdWUww3CNrYmqza1Fg0DURc2K/O4YrnklBdQarSJ/y8JnJYDGc+1iumQjg== -"kaltura-player-js@https://github.com/kaltura/kaltura-player-js.git#master": - version "3.9.0" - resolved "https://github.com/kaltura/kaltura-player-js.git#c5635d88517192b3fbeb295bbe639595a7735898" - dependencies: - "@babel/polyfill" "^7.0.0" - "@playkit-js/playkit-js" canary - "@playkit-js/playkit-js-dash" "1.31.4" - "@playkit-js/playkit-js-hls" "1.31.2" - "@playkit-js/playkit-js-ui" canary - "@types/preact-i18n" "^2.3.1" - hls.js "1.3.1" - intersection-observer "^0.12.0" - playkit-js-providers "https://github.com/kaltura/playkit-js-providers.git#master" - proxy-polyfill "^0.3.0" - shaka-player "4.3.3" - karma-chai@^0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/karma-chai/-/karma-chai-0.1.0.tgz#bee5ad40400517811ae34bb945f762909108b79a" @@ -8168,10 +8174,6 @@ pkg-dir@^5.0.0: dependencies: find-up "^5.0.0" -"playkit-js-providers@https://github.com/kaltura/playkit-js-providers.git#master": - version "2.37.0" - resolved "https://github.com/kaltura/playkit-js-providers.git#ad711e82ea326cc27b1a4767058a8b6632dfd553" - please-upgrade-node@^3.2.0: version "3.2.0" resolved "https://registry.yarnpkg.com/please-upgrade-node/-/please-upgrade-node-3.2.0.tgz#aeddd3f994c933e4ad98b99d9a556efa0e2fe942" @@ -9255,10 +9257,10 @@ sha.js@^2.4.0, sha.js@^2.4.8: inherits "^2.0.1" safe-buffer "^5.0.1" -shaka-player@4.3.3: - version "4.3.3" - resolved "https://registry.yarnpkg.com/shaka-player/-/shaka-player-4.3.3.tgz#8e35bd3f6faad4002395590c259d487c79240d64" - integrity sha512-UMaTwebmrpwYNFNnP8iRSR8cMdOvUMnisDa38Wkmmd63rWOQWbPq1DI1BIEu9oAUPIKXav6teelLRycdTnWKaQ== +shaka-player@4.3.5: + version "4.3.5" + resolved "https://registry.yarnpkg.com/shaka-player/-/shaka-player-4.3.5.tgz#304d60ad867fb7a0780b850b32a9614296b842db" + integrity sha512-WkqvHm8QHOsQ71d/qoc2Wa6Z5rBrG3Zgsc6ho9I9e8Xwa0io+MeREgqBuG0z6qoXK55sTImipFhDoERrkmDdUg== dependencies: eme-encryption-scheme-polyfill "^2.1.1" From 4523e884e99af35674ff8eeb3e7a6f289d464af6 Mon Sep 17 00:00:00 2001 From: ovp-github-actions Date: Wed, 17 May 2023 14:18:17 +0000 Subject: [PATCH 2/2] chore(release): 1.1.10 --- CHANGELOG.md | 7 +++++++ package.json | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9f6027a..207d331 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,13 @@ 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. +### 1.1.10 (2023-05-17) + + +### Bug Fixes + +* **FEC-13123:** replace travis with github actions ([#23](https://github.com/kaltura/playkit-js-share/issues/23)) ([793a8be](https://github.com/kaltura/playkit-js-share/commit/793a8be4a8881e495c7fadf3f66bfc845a3ced03)) + ### 1.1.9 (2023-05-07) ### [1.1.8](https://github.com/kaltura/playkit-js-share/compare/v1.1.7...v1.1.8) (2023-02-22) diff --git a/package.json b/package.json index 737305d..e8b63d6 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@playkit-js/share", - "version": "1.1.9", + "version": "1.1.10", "keywords": [ "kaltura", "player",