Skip to content

Commit

Permalink
Merge branch 'master' into devops-deployment
Browse files Browse the repository at this point in the history
use node 18
  • Loading branch information
giladna committed May 19, 2023
2 parents c3ed349 + f59acac commit 40c8e88
Show file tree
Hide file tree
Showing 10 changed files with 134 additions and 91 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/run_canary_full_flow.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ on:
jobs:
canary-full-flow:
if: ${{ github.actor != 'PlaykitJs-Bot' }}
uses: kaltura/ovp-pipelines-pub/.github/workflows/player_cicd.yaml@v1.0.0
uses: kaltura/ovp-pipelines-pub/.github/workflows/player_cicd.yaml@master
secrets:
PLAYER_CENTRAL_ACCOUNT_ID: ${{ secrets.PLAYER_CENTRAL_ACCOUNT_ID }}
PLAYER_SERVICES_ACCOUNT_ID: ${{ secrets.PLAYER_SERVICES_ACCOUNT_ID }}
Expand All @@ -24,4 +24,5 @@ jobs:
type: "plugin"
stage: "canary"
schema-type: "playerV3OvpVersions"
node-version: "18.x"
tests-yarn-run-to-execute: 'test'
3 changes: 2 additions & 1 deletion .github/workflows/run_prod.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:

jobs:
prod:
uses: kaltura/ovp-pipelines-pub/.github/workflows/player_cicd.yaml@v1.0.0
uses: kaltura/ovp-pipelines-pub/.github/workflows/player_cicd.yaml@master
secrets:
PLAYER_CENTRAL_ACCOUNT_ID: ${{ secrets.PLAYER_CENTRAL_ACCOUNT_ID }}
PLAYER_SERVICES_ACCOUNT_ID: ${{ secrets.PLAYER_SERVICES_ACCOUNT_ID }}
Expand All @@ -21,4 +21,5 @@ jobs:
type: "plugin"
env: "prod"
schema-type: "playerV3OvpVersions"
node-version: "18.x"
tests-yarn-run-to-execute: 'test'
5 changes: 3 additions & 2 deletions .github/workflows/run_tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,13 @@ on:

jobs:
running-tests:
uses: kaltura/ovp-pipelines-pub/.github/workflows/player_tests.yaml@v1.0.0
uses: kaltura/ovp-pipelines-pub/.github/workflows/player_tests.yaml@master
with:
yarn-run-to-execute: 'test'
node-version: "18.x"
notification:
if: always()
uses: kaltura/ovp-pipelines-pub/.github/workflows/notification.yaml@v1.0.0
uses: kaltura/ovp-pipelines-pub/.github/workflows/notification.yaml@master
needs: running-tests
secrets:
PLAYER_MSTEAMS_WEBHOOK: ${{ secrets.PLAYER_MSTEAMS_WEBHOOK }}
Expand Down
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,14 @@

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.2.4](https://github.com/kaltura/playkit-js-info/compare/v3.2.3...v3.2.4) (2023-05-17)


### Bug Fixes

* **FEC-13145:** upd dependencies1 ([#50](https://github.com/kaltura/playkit-js-info/issues/50)) ([d05412d](https://github.com/kaltura/playkit-js-info/commit/d05412d77e72ec96b776d30612aa2bd853747011))
* **FEC-13145:** upgrade dependancies for common and ui-managers etc ([#51](https://github.com/kaltura/playkit-js-info/issues/51)) ([b695faa](https://github.com/kaltura/playkit-js-info/commit/b695faa779667a1766499863890d4b7db2a04c09))

### [3.2.3](https://github.com/kaltura/playkit-js-info/compare/v3.2.2...v3.2.3) (2023-03-22)

### [3.2.2](https://github.com/kaltura/playkit-js-info/compare/v3.2.1...v3.2.2) (2023-02-23)
Expand Down
12 changes: 6 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@playkit-js/info",
"version": "3.2.3",
"version": "3.2.4",
"main": "dist/playkit-info.js",
"private": false,
"bugs": {
Expand All @@ -15,12 +15,12 @@
"access": "public"
},
"devDependencies": {
"@playkit-js/kaltura-player-js": "canary",
"@types/sanitize-html": "^2.8.0",
"conventional-github-releaser": "3.1.3",
"cross-env": "^7.0.3",
"css-loader": "^6.7.1",
"cypress": "^12.12.0",
"kaltura-player-js": "https://github.com/kaltura/kaltura-player-js.git#master",
"playwright-webkit": "^1.31.1",
"prettier": "^2.6.2",
"sass": "^1.52.3",
Expand All @@ -35,7 +35,7 @@
"webpack-dev-server": "^4.9.0"
},
"peerDependencies": {
"kaltura-player-js": "https://github.com/kaltura/kaltura-player-js.git#master"
"@playkit-js/kaltura-player-js": "canary"
},
"scripts": {
"clean": "rm -rf ./dist",
Expand Down Expand Up @@ -65,14 +65,14 @@
"html5 player"
],
"dependencies": {
"@playkit-js/common": "^1.1.2",
"@playkit-js/ui-managers": "^1.3.5",
"@playkit-js/common": "^1.2.3",
"@playkit-js/ui-managers": "^1.3.8",
"sanitize-html": "^2.8.0"
},
"kaltura": {
"name": "playkit-js-info",
"dependencies": {
"playkit-ui-managers": "1.3.5"
"playkit-ui-managers": "1.3.8"
}
}
}
2 changes: 1 addition & 1 deletion src/components/plugin-button/index.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import {h} from 'preact';
import {icons} from '../icons';
import {ui} from 'kaltura-player-js';
import {ui} from '@playkit-js/kaltura-player-js';
import {A11yWrapper, OnClick} from '@playkit-js/common/dist/hoc/a11y-wrapper';

const {Tooltip, Icon} = KalturaPlayer.ui.components;
Expand Down
3 changes: 2 additions & 1 deletion src/info-plugin.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,12 @@ import {h} from 'preact';
import {Info} from './components/info';
import {PluginButton} from './components/plugin-button';
import {timeSince} from './utils';
import {ui} from 'kaltura-player-js';
import {ui} from '@playkit-js/kaltura-player-js';
import {icons} from './components/icons';
import {UpperBarManager} from '@playkit-js/ui-managers';
const {ReservedPresetNames} = ui;

// @ts-ignore
export class PlaykitJsInfoPlugin extends KalturaPlayer.core.BasePlugin {
private _wasPlayed = false; // keep state of the player so we can resume if needed
private _removeActiveOverlay: null | Function = null;
Expand Down
2 changes: 1 addition & 1 deletion tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,5 @@
"types": ["cypress", "node"],
"lib": ["es2015", "dom"]
},
"include": ["cypress/e2e/*.ts", "src/**/*.tsx", "src/**/*.ts", "custom.d.ts", "node_modules/kaltura-player-js/ts-typed"]
"include": ["cypress/e2e/*.ts", "src/**/*.tsx", "src/**/*.ts", "custom.d.ts", "node_modules/@playkit-js/kaltura-player-js/ts-typed"]
}
4 changes: 2 additions & 2 deletions webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ module.exports = {
modules: [path.resolve(__dirname, 'src'), 'node_modules']
},
externals: {
preact: 'root KalturaPlayer.ui.preact',
'kaltura-player-js': ['KalturaPlayer']
'@playkit-js/kaltura-player-js': 'root KalturaPlayer',
preact: 'root KalturaPlayer.ui.preact'
}
};

0 comments on commit 40c8e88

Please sign in to comment.