diff --git a/.github/workflows/run_canary_full_flow.yaml b/.github/workflows/run_canary_full_flow.yaml index 777c354..221c149 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: 'lint:check types:check test' + tests-yarn-run-to-execute: 'build lint:check types:check test' diff --git a/.github/workflows/run_prod.yaml b/.github/workflows/run_prod.yaml index 04ba683..fa38313 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: 'lint:check types:check test' + tests-yarn-run-to-execute: 'build lint:check types:check test' diff --git a/.github/workflows/run_tests.yaml b/.github/workflows/run_tests.yaml index c7c9b7c..128a225 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: 'lint:check types:check test' + yarn-run-to-execute: 'build lint:check types:check test' notification: if: always() uses: kaltura/ovp-pipelines-pub/.github/workflows/notification.yaml@v1.0.0 diff --git a/package.json b/package.json index dde13fc..a10ca8b 100644 --- a/package.json +++ b/package.json @@ -23,7 +23,6 @@ "dev": "npm run build:dev && webpack serve --open --mode development", "watch": "webpack --watch --mode development", "build:dev": "webpack --mode development", - "build:prod": "webpack --mode production", "build": "webpack --mode production", "test": "echo \"no test specified\" && exit 0", "types:check": "tsc src/index.ts src/types/global.d.ts --noEmit --target ESNext --moduleResolution node", @@ -47,7 +46,7 @@ "eslint": "^7.32.0", "eslint-config-preact": "^1.3.0", "eslint-plugin-prettier": "^4.0.0", - "kaltura-player-js": "https://github.com/kaltura/kaltura-player-js.git#master", + "@playkit-js/kaltura-player-js": "canary", "prettier": "^2.6.2", "sass": "^1.52.1", "sass-loader": "^13.0.0", @@ -60,7 +59,7 @@ "webpack-dev-server": "^4.8.1" }, "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/google-tag-manager.ts b/src/google-tag-manager.ts index bcf5ca8..162f2bb 100644 --- a/src/google-tag-manager.ts +++ b/src/google-tag-manager.ts @@ -1,4 +1,4 @@ -import { BasePlugin, EventTypes, FakeEvent, KalturaPlayer } from 'kaltura-player-js'; +import { BasePlugin, EventTypes, FakeEvent, KalturaPlayer } from '@playkit-js/kaltura-player-js'; import { HEAD_TAG, BODY_TAG } from './gtm-tags'; import { GoogleTagManagerConfig } from './models/google-tag-manager-config'; diff --git a/src/index.ts b/src/index.ts index e48946a..f553292 100644 --- a/src/index.ts +++ b/src/index.ts @@ -1,4 +1,4 @@ -import { registerPlugin } from 'kaltura-player-js'; +import { registerPlugin } from '@playkit-js/kaltura-player-js'; import { pluginName, GoogleTagManager } from './google-tag-manager'; registerPlugin(pluginName, GoogleTagManager); diff --git a/webpack.config.js b/webpack.config.js index 820d16a..4111cd2 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -49,7 +49,7 @@ module.exports = (env, { mode }) => { clean: true }, externals: { - 'kaltura-player-js': 'root KalturaPlayer' + '@playkit-js/kaltura-player-js': 'root KalturaPlayer' }, devServer: { static: { diff --git a/yarn.lock b/yarn.lock index 58e8b48..9c7dfa9 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1157,30 +1157,52 @@ "@nodelib/fs.scandir" "2.1.5" fastq "^1.6.0" -"@playkit-js/playkit-js-dash@1.34.0": - version "1.34.0" - resolved "https://registry.yarnpkg.com/@playkit-js/playkit-js-dash/-/playkit-js-dash-1.34.0.tgz#a4e31d68420a8c80ebb973dc69ab423794c73b4d" - integrity sha512-hQmGYssn/nIr1/UMMhFGCaKv1vqBLl0G22Ba5Z9frzcj8anpE/0v98MLpRbnPdkazeGg6jkGKFmBbt+BMY6zhQ== +"@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.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-hls@1.32.2": - version "1.32.2" - resolved "https://registry.yarnpkg.com/@playkit-js/playkit-js-hls/-/playkit-js-hls-1.32.2.tgz#ee9e17888d0764c7728064127d1588ccf3eff854" - integrity sha512-9xc9Vl1eoMlZTpEhNH/lVg66u56zG+J2jBSsFXVDiSvTv5Qgs7t8RiB04QEl9PF9b2VFh8ANbvoCbIdd3HnYjQ== +"@playkit-js/playkit-js-providers@^2.39.3-canary.0-e04b57d": + version "2.39.3-canary.0-edd6027" + resolved "https://registry.yarnpkg.com/@playkit-js/playkit-js-providers/-/playkit-js-providers-2.39.3-canary.0-edd6027.tgz#61d464590cb15981b9f8febdfe93156dac269a0f" + integrity sha512-qOfHROzAGs4m0JMdNWifvkM5SkKmdwPySOp4XwRzHadnE8eWSoe2y1q1OZup7FsBpslTLAD42FPTPi8Lj9DpkA== -"@playkit-js/playkit-js-ui@0.77.0": - version "0.77.0" - resolved "https://registry.yarnpkg.com/@playkit-js/playkit-js-ui/-/playkit-js-ui-0.77.0.tgz#e6e9b1533cc60496a9271dca163118e56b561647" - integrity sha512-gmFzjsiU3PSMEf63T8qlio2U4MjZpHtU9pd9YHM2YqgZXTK+KOVxhv6nCOjVCgC1otQa9McW/tlEkbG/MiTL8g== +"@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@0.82.1": - version "0.82.1" - resolved "https://registry.yarnpkg.com/@playkit-js/playkit-js/-/playkit-js-0.82.1.tgz#3e821ac5eb979eaefa9a72bf85c792fb39796a12" - integrity sha512-b+BRGkGwXgrhfKMwwtu1vPfpLVIUxb+w8GHgpGd0cx16quF96vMF51pDz1bvFdlb49i/WWynmnxehhQX5JhJUw== +"@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" @@ -3833,22 +3855,6 @@ jsonparse@^1.2.0: array-includes "^3.1.5" object.assign "^4.1.3" -"kaltura-player-js@https://github.com/kaltura/kaltura-player-js.git#master": - version "3.14.0" - resolved "https://github.com/kaltura/kaltura-player-js.git#49ad6c7e5c7ce13eaeceb9ec63325c0f91a86b8d" - dependencies: - "@babel/polyfill" "^7.0.0" - "@playkit-js/playkit-js" "0.82.1" - "@playkit-js/playkit-js-dash" "1.34.0" - "@playkit-js/playkit-js-hls" "1.32.2" - "@playkit-js/playkit-js-ui" "0.77.0" - "@types/preact-i18n" "^2.3.1" - hls.js "1.3.5" - intersection-observer "^0.12.0" - playkit-js-providers "https://github.com/kaltura/playkit-js-providers.git#v2.39.0" - proxy-polyfill "^0.3.0" - shaka-player "4.3.5" - kind-of@^6.0.2, kind-of@^6.0.3: version "6.0.3" resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd" @@ -4485,10 +4491,6 @@ pkg-dir@^4.1.0, pkg-dir@^4.2.0: dependencies: find-up "^4.0.0" -"playkit-js-providers@https://github.com/kaltura/playkit-js-providers.git#v2.39.0": - version "2.39.0" - resolved "https://github.com/kaltura/playkit-js-providers.git#ddaac7ae611eab35ad33249061bbca8f3e4fc787" - postcss-modules-extract-imports@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.0.0.tgz#cda1f047c0ae80c97dbe28c3e76a43b88025741d"