Skip to content

Commit 0ce2d6f

Browse files
semarche-kalturasemarche-kaltura
authored
fix(FEC-13145): upgrade dependancies for common and ui-managers etc (#317)
* fix(FEC-13145): upd dependencies * fix(FEC-13145): upd dependencies
1 parent a88ba17 commit 0ce2d6f

File tree

19 files changed

+129
-111
lines changed

19 files changed

+129
-111
lines changed

‎cypress/e2e/navigation.cy.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// @ts-ignore
2-
import {core, KalturaPlayer} from 'kaltura-player-js';
2+
import {core, KalturaPlayer} from '@playkit-js/kaltura-player-js';
33

44
const {FakeEvent} = core;
55
const MANIFEST = `#EXTM3U

‎cypress/public/ui-conf.js

+16-16
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

+7-4
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,16 @@
1212
"url": "git+https://github.com/kaltura/playkit-js-navigation.git"
1313
},
1414
"dependencies": {
15-
"@playkit-js/common": "^1.2.2",
16-
"@playkit-js/playkit-js-ui": "^0.73.0",
15+
"@playkit-js/common": "^1.2.3",
16+
"@playkit-js/playkit-js-ui": "^0.77.1",
1717
"@playkit-js/ui-managers": "^1.3.8"
1818
},
1919
"devDependencies": {
20+
"@playkit-js/kaltura-player-js": "canary",
2021
"conventional-github-releaser": "3.1.3",
2122
"cross-env": "^7.0.3",
2223
"css-loader": "^6.7.1",
23-
"cypress": "^12.5.0",
24-
"kaltura-player-js": "https://github.com/kaltura/kaltura-player-js.git#master",
24+
"cypress": "^12.12.0",
2525
"playwright-webkit": "^1.31.2",
2626
"prettier": "^2.6.2",
2727
"sass": "^1.52.3",
@@ -35,6 +35,9 @@
3535
"webpack-cli": "^4.9.2",
3636
"webpack-dev-server": "^4.9.0"
3737
},
38+
"peerDependencies": {
39+
"@playkit-js/kaltura-player-js": "canary"
40+
},
3841
"license": "AGPL-3.0",
3942
"files": [
4043
"dist",

‎src/components/close-button/index.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import {h} from 'preact';
2-
import {ui} from 'kaltura-player-js';
2+
import {ui} from '@playkit-js/kaltura-player-js';
33
import * as styles from './close-button.scss';
44
import {A11yWrapper} from '@playkit-js/common/dist/hoc/a11y-wrapper';
55
import {icons} from '../icons';

‎src/components/error/error.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import {h} from 'preact';
2-
import {ui} from 'kaltura-player-js';
2+
import {ui} from '@playkit-js/kaltura-player-js';
33
import {A11yWrapper} from '@playkit-js/common/dist/hoc/a11y-wrapper';
44
import * as styles from './error.scss';
55
import {ErrorIconSVG} from '../icons/error-icon';

‎src/components/loading/loading.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import {h} from 'preact';
2-
import {ui} from 'kaltura-player-js';
2+
import {ui} from '@playkit-js/kaltura-player-js';
33
import * as styles from './loading.scss';
44
import {LoaderIconSVG} from '../icons/loader-icon';
55

‎src/components/navigation-filter/navigation-filter.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import {h, Component, Fragment} from 'preact';
2-
import {ui} from 'kaltura-player-js';
2+
import {ui} from '@playkit-js/kaltura-player-js';
33
import {A11yWrapper} from '@playkit-js/common/dist/hoc/a11y-wrapper';
44
import * as styles from './navigation-filter.scss';
55
import {ItemTypes, ItemTypesTranslates} from '../../types';

‎src/components/navigation-search/navigation-search.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import {h, Component} from 'preact';
2-
import {ui} from 'kaltura-player-js';
2+
import {ui} from '@playkit-js/kaltura-player-js';
33
import {InputField} from '@playkit-js/common/dist/components/input-field';
44
import {debounce} from '@playkit-js/common/dist/utils-common/utils';
55

‎src/components/navigation/autoscroll-button/autoscroll-button.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import {h} from 'preact';
2-
import {ui} from 'kaltura-player-js';
2+
import {ui} from '@playkit-js/kaltura-player-js';
33
import * as styles from './autoscroll-button.scss';
44
import {A11yWrapper, OnClick} from '@playkit-js/common/dist/hoc/a11y-wrapper';
55

‎src/components/navigation/icons/EmptyList.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import {h} from 'preact';
2-
import {ui} from 'kaltura-player-js';
2+
import {ui} from '@playkit-js/kaltura-player-js';
33
import * as styles from './EmptyList.scss';
44

55
const {withText, Text} = ui.preacti18n;

‎src/components/navigation/icons/EmptyState.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import {h} from 'preact';
22
import * as styles from './EmptyState.scss';
33
import {ARROW_IMG, CURLY_LINE_IMG} from "../../constants/svgs";
4-
import {ui} from 'kaltura-player-js';
4+
import {ui} from '@playkit-js/kaltura-player-js';
55
const {withText, Text} = ui.preacti18n;
66

77
interface EmptyStateProps {

‎src/components/navigation/index.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import {h, Component} from 'preact';
2-
import {ui} from 'kaltura-player-js';
2+
import {ui} from '@playkit-js/kaltura-player-js';
33
import * as styles from './navigaton.scss';
44
import {OnClick} from '@playkit-js/common/dist/hoc/a11y-wrapper';
55
import {NavigationList, Props} from './navigation-list/NavigationList';

‎src/components/navigation/navigation-item/QuizTitle.tsx

+9-10
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import {h, Component} from "preact";
2-
import * as styles from "./QuizTitle.scss";
3-
import {ui} from "kaltura-player-js";
1+
import {h, Component} from 'preact';
2+
import * as styles from './QuizTitle.scss';
3+
import {ui} from '@playkit-js/kaltura-player-js';
44
const {withText, Text} = ui.preacti18n;
55

66
const translates = (props: QuizItemProps) => {
@@ -30,15 +30,15 @@ const translates = (props: QuizItemProps) => {
3030
return {
3131
...labelTranslate,
3232
title: <Text id="navigation.reflection_point_title" fields={{index: `${currentIndex}`}}>{`Reflection point ${currentIndex}`}</Text>
33-
}
33+
};
3434
} else {
3535
// Question
3636
return {
3737
...labelTranslate,
3838
title: <Text id="navigation.question_title" fields={{index: `${currentIndex}`}}>{`Question ${currentIndex}`}</Text>
39-
}
39+
};
4040
}
41-
}
41+
};
4242

4343
export interface QuizItemProps {
4444
questionState: number;
@@ -58,7 +58,7 @@ export class QuizTitle extends Component<QuizItemProps> {
5858
labelClass = styles.correct;
5959
}
6060
return (
61-
<div className={`${styles.labelWrapper} ${labelClass}`} data-testid='navigation_questionStateLabel'>
61+
<div className={`${styles.labelWrapper} ${labelClass}`} data-testid="navigation_questionStateLabel">
6262
<span>{this.props.stateLabel}</span>
6363
</div>
6464
);
@@ -67,12 +67,11 @@ export class QuizTitle extends Component<QuizItemProps> {
6767
render(props: QuizItemProps) {
6868
return (
6969
<div className={styles.titleWrapper}>
70-
<div className={styles.title} data-testid='navigation_questionTitle'>
70+
<div className={styles.title} data-testid="navigation_questionTitle">
7171
<span>{this.props.title}</span>
7272
</div>
7373
{this.props.questionState !== 1 ? this._renderStateLabel() : undefined}
7474
</div>
7575
);
7676
}
77-
78-
}
77+
}

‎src/components/navigation/navigation-list/NavigationList.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import {Component, h} from 'preact';
2-
import {ui} from 'kaltura-player-js';
2+
import {ui} from '@playkit-js/kaltura-player-js';
33
import * as styles from './NavigationList.scss';
44
import {NavigationItem} from '../navigation-item/NavigationItem';
55
import {EmptyList} from '../icons/EmptyList';

‎src/components/navigation/plugin-button/index.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import {h} from 'preact';
2-
import {ui} from 'kaltura-player-js';
2+
import {ui} from '@playkit-js/kaltura-player-js';
33
import * as styles from './plugin-button.scss';
44
import {icons} from '../../icons';
55
import {A11yWrapper, OnClick} from '@playkit-js/common/dist/hoc/a11y-wrapper';

‎src/navigation-plugin.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// @ts-ignore
2-
import {core, ui} from 'kaltura-player-js';
2+
import {core, ui} from '@playkit-js/kaltura-player-js';
33
import {h} from 'preact';
44
import {UpperBarManager, SidePanelsManager} from '@playkit-js/ui-managers';
55
import {OnClickEvent} from '@playkit-js/common/dist/hoc/a11y-wrapper';

‎tsconfig.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,5 @@
1818
"types": ["cypress", "node"],
1919
"lib": ["es2015", "dom"]
2020
},
21-
"include": ["cypress/e2e/*.ts", "src/**/*.tsx", "src/**/*.ts", "custom.d.ts", "node_modules/kaltura-player-js/ts-typed"]
21+
"include": ["cypress/e2e/*.ts", "src/**/*.tsx", "src/**/*.ts", "custom.d.ts", "node_modules/@playkit-js/kaltura-player-js/ts-typed"]
2222
}

‎webpack.config.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ module.exports = {
6565
modules: [path.resolve(__dirname, 'src'), 'node_modules']
6666
},
6767
externals: {
68-
preact: 'root KalturaPlayer.ui.preact',
69-
'kaltura-player-js': ['KalturaPlayer']
68+
'@playkit-js/kaltura-player-js': 'root KalturaPlayer',
69+
preact: 'root KalturaPlayer.ui.preact'
7070
}
7171
};

0 commit comments

Comments
 (0)