Skip to content

Commit b408157

Browse files
tsitsi
committed
Merge branch 'master' into update-master-from-edge
2 parents f51a1e1 + b163910 commit b408157

File tree

8 files changed

+183
-4
lines changed

8 files changed

+183
-4
lines changed

‎.github/workflows/release-manual.yml‎

Lines changed: 85 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,85 @@
1+
name: 🔧 Release (Manual)
2+
3+
on:
4+
workflow_dispatch:
5+
inputs:
6+
release-as:
7+
description: 'Release Version'
8+
required: true
9+
release-type:
10+
description: 'Release Type'
11+
type: choice
12+
required: true
13+
default: 'edge'
14+
options:
15+
- edge
16+
- latest
17+
18+
jobs:
19+
release:
20+
runs-on: ubuntu-latest
21+
22+
steps:
23+
- uses: actions/checkout@v4
24+
with:
25+
ref: ${{ github.event.inputs.release-type == 'latest' && 'master' || 'edge'}}
26+
27+
- run: npm ci
28+
29+
- name: Release PR
30+
uses: google-github-actions/release-please-action@v3
31+
id: release
32+
with:
33+
token: ${{ secrets.BOT_TOKEN }}
34+
release-type: node
35+
release-as: ${{ github.event.inputs.release-as }}
36+
prerelease: ${{ github.event.inputs.release-type == 'edge'}}
37+
default-branch: ${{ github.event.inputs.release-type == 'latest' && 'master' || 'edge'}}
38+
39+
# The logic below handles the npm publication:
40+
- uses: actions/setup-node@v4
41+
with:
42+
node-version: '20.x'
43+
registry-url: 'https://registry.npmjs.org'
44+
if: ${{ steps.release.outputs.release_created }}
45+
# these if statements ensure that a publication only occurs when
46+
# a new release is created:
47+
- run: npm run build-all
48+
if: ${{ steps.release.outputs.release_created }}
49+
- run: npm publish --tag ${{ github.event.inputs.release-type }}
50+
env:
51+
NODE_AUTH_TOKEN: ${{secrets.NPM_TOKEN}}
52+
if: ${{ steps.release.outputs.release_created }}
53+
54+
- name: Set Notification Messages
55+
id: set-messages
56+
if: steps.release.outputs.release_created
57+
run: |
58+
if [[ ${{ job.status }} == "success" ]]; then
59+
echo "SLACK_TITLE=Video Player ${{ steps.release.outputs.tag_name }} Deployed" >> $GITHUB_OUTPUT
60+
echo "SLACK_MESSAGE=Success :rocket: cloudinary-video-player version ${{ steps.release.outputs.tag_name }} deployed successfully" >> $GITHUB_OUTPUT
61+
echo "SLACK_FOOTER=Check it out at https://cloudinary.github.io/cloudinary-video-player/?ver=${{ github.event.inputs.release-type }}&min=true" >> $GITHUB_OUTPUT
62+
else
63+
echo "SLACK_TITLE=Video Player Deployment Failed" >> $GITHUB_OUTPUT
64+
echo "SLACK_MESSAGE=:alert: Failed to deploy cloudinary-video-player version ${{ steps.release.outputs.tag_name }}" >> $GITHUB_OUTPUT
65+
echo "SLACK_FOOTER=See log here https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}/job/${{ github.job }}" >> $GITHUB_OUTPUT
66+
fi
67+
shell: bash
68+
69+
- name: Slack Notification
70+
if: steps.release.outputs.release_created
71+
uses: rtCamp/action-slack-notify@v2.2.0
72+
env:
73+
SLACK_WEBHOOK: ${{ vars.FE_DEPLOYMENTS_SLACK_WEBHOOK }}
74+
SLACK_CHANNEL: 'rnd-fe-releases'
75+
SLACK_COLOR: ${{ job.status }}
76+
SLACK_TITLE: ${{ steps.set-messages.outputs.SLACK_TITLE }}
77+
SLACK_MESSAGE: ${{ steps.set-messages.outputs.SLACK_MESSAGE }}
78+
SLACK_FOOTER: ${{ steps.set-messages.outputs.SLACK_FOOTER }}
79+
80+
- uses: gacts/purge-jsdelivr-cache@v1
81+
if: steps.release.outputs.release_created
82+
with:
83+
url: |
84+
https://cdn.jsdelivr.net/npm/cloudinary-video-player
85+
https://cdn.jsdelivr.net/npm/cloudinary-video-player@edge

‎CHANGELOG.md‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,40 @@
11
# Changelog
22

33

4+
## [2.1.1](https://github.com/cloudinary/cloudinary-video-player/compare/v2.1.0...v2.1.1) (2024-11-05)
5+
6+
### Features
7+
8+
* add internal analytics about new method & profiles ([#699](https://github.com/cloudinary/cloudinary-video-player/issues/699)) ([a1c8c1e](https://github.com/cloudinary/cloudinary-video-player/commit/a1c8c1eb4ffd8362ce4cc7ab5ed47276cc5651ee))
9+
* add url template for video player profiles ([#696](https://github.com/cloudinary/cloudinary-video-player/issues/696)) ([d60cb4f](https://github.com/cloudinary/cloudinary-video-player/commit/d60cb4f4fc9d8b0ff2a6f0e21621c6c84063c898))
10+
11+
### Bug Fixes
12+
13+
* use cld player profiles package for default profiles ([#701](https://github.com/cloudinary/cloudinary-video-player/issues/701)) ([1083b94](https://github.com/cloudinary/cloudinary-video-player/commit/1083b94ac96f4e075d8d820a894703eb644bec7a))
14+
15+
## [2.1.0](https://github.com/cloudinary/cloudinary-video-player/compare/v2.0.5...v2.1.0) (2024-08-21)
16+
17+
18+
### Features
19+
20+
* custom data video analytics param ([2aba293](https://github.com/cloudinary/cloudinary-video-player/commit/2aba293436035f2fedfcb51c3063913f1261d564))
21+
* new 'player' method with support async loading & profiles ([2aba293](https://github.com/cloudinary/cloudinary-video-player/commit/2aba293436035f2fedfcb51c3063913f1261d564))
22+
23+
24+
### Bug Fixes
25+
26+
* update dependencies ([#688](https://github.com/cloudinary/cloudinary-video-player/issues/688)) ([2aba293](https://github.com/cloudinary/cloudinary-video-player/commit/2aba293436035f2fedfcb51c3063913f1261d564))
27+
28+
## [2.0.5](https://github.com/cloudinary/cloudinary-video-player/compare/v2.0.4...v2.0.5) (2024-07-15)
29+
30+
31+
### Bug Fixes
32+
33+
* chapters innerHTML to innerText ([#671](https://github.com/cloudinary/cloudinary-video-player/issues/671)) ([d9b6251](https://github.com/cloudinary/cloudinary-video-player/commit/d9b62513c7abe9eba3458c5193f178ebc6250543))
34+
* custom profile docs example ([#673](https://github.com/cloudinary/cloudinary-video-player/issues/673)) ([d9b6251](https://github.com/cloudinary/cloudinary-video-player/commit/d9b62513c7abe9eba3458c5193f178ebc6250543))
35+
* remove IE polyfill ([#665](https://github.com/cloudinary/cloudinary-video-player/issues/665)) ([d9b6251](https://github.com/cloudinary/cloudinary-video-player/commit/d9b62513c7abe9eba3458c5193f178ebc6250543))
36+
* use videojs events & re-trigger to analytics package with custom… ([#639](https://github.com/cloudinary/cloudinary-video-player/issues/639)) ([d9b6251](https://github.com/cloudinary/cloudinary-video-player/commit/d9b62513c7abe9eba3458c5193f178ebc6250543))
37+
438
## [2.0.4](https://github.com/cloudinary/cloudinary-video-player/compare/v2.0.3...v2.0.4) (2024-06-17)
539

640

‎docs/es-modules/interaction-area.html‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,9 +86,10 @@ <h3>Auto-zoom video cropping</h3>
8686

8787
<script type="module">
8888
import cloudinary from 'cloudinary-video-player/all';
89-
import 'cloudinary-video-player/cld-video-player.min.css';
9089
import 'cloudinary-video-player/interaction-areas';
9190

91+
import 'cloudinary-video-player/cld-video-player.min.css';
92+
9293
const playerOption = {
9394
cloudName: 'demo',
9495
bigPlayButton: false,

‎docs/es-modules/recommendations.html‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,10 @@ <h3 class="mb-4">Recommendations</h3>
3636
</div>
3737

3838
<script type="module">
39+
import { videoPlayer } from 'cloudinary-video-player';
3940
import 'cloudinary-video-player/recommendations-overlay';
41+
4042
import 'cloudinary-video-player/cld-video-player.min.css';
41-
import { videoPlayer } from 'cloudinary-video-player';
4243

4344
const source1 = {
4445
publicId: 'surf_competition',

‎docs/es-modules/shoppable.html‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,11 @@ <h3 class="mb-4">Shoppable Videos</h3>
3636
</div>
3737

3838
<script type="module">
39-
import 'cloudinary-video-player/cld-video-player.min.css';
4039
import { videoPlayer } from 'cloudinary-video-player';
4140
import 'cloudinary-video-player/shoppable';
4241

42+
import 'cloudinary-video-player/cld-video-player.min.css';
43+
4344
const player = videoPlayer('player', {
4445
cloudName: 'demo'
4546
});

‎docs/es-modules/subtitles-and-captions.html‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,9 +124,10 @@ <h4 class="mt-4 mb-2">Translated Transcript</h4>
124124

125125
<script type="module">
126126
import { videoPlayer } from 'cloudinary-video-player';
127-
import 'cloudinary-video-player/cld-video-player.min.css';
128127
import 'cloudinary-video-player/playlist';
129128

129+
import 'cloudinary-video-player/cld-video-player.min.css';
130+
130131
const player = videoPlayer('player', {
131132
cloudName: 'prod'
132133
});

‎docs/profiles.html‎

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,10 @@
2323
<script type="text/javascript" src="./scripts.js"></script>
2424

2525
<script type="text/javascript">
26+
window.addEventListener('load', async () => {
27+
const playerWithDefaultProfile = await cloudinary.player('player-default-profile', {
28+
cloudName: 'demo',
29+
profile: 'cld-default',
2630
window.addEventListener('load', async () => {
2731
const playerWithDefaultProfile = await cloudinary.player('player-default-profile', {
2832
cloudName: 'demo',
@@ -32,6 +36,12 @@
3236
playerWithDefaultProfile.source('sea_turtle');
3337
}, false);
3438

39+
window.addEventListener('load', async function() {
40+
const playerWithCustomProfile = await cloudinary.player('player-custom-profile', {
41+
cloudName: 'prod',
42+
profile: 'myCustomProfile',
43+
}, false);
44+
3545
window.addEventListener('load', async function() {
3646
const playerWithCustomProfile = await cloudinary.player('player-custom-profile', {
3747
cloudName: 'prod',
@@ -54,6 +64,20 @@
5464

5565
playerWithCustomProfileAndOverrides.source('samples/cld-sample-video');
5666
}, false);
67+
68+
window.addEventListener('load', async function() {
69+
const playerWithCustomProfileAndOverrides = await cloudinary.player('player-custom-profile-overrides', {
70+
cloudName: 'prod',
71+
profile: 'myCustomProfile',
72+
colors: {
73+
base: "#1532a8"
74+
},
75+
seekThumbnails: false,
76+
aiHighlightsGraph: true,
77+
});
78+
79+
playerWithCustomProfileAndOverrides.source('samples/cld-sample-video');
80+
}, false);
5781
</script>
5882
</head>
5983
<body>
@@ -77,6 +101,34 @@ <h5>Player with default profile</h5>
77101

78102
<h3 class="mt-4">Example Code:</h3>
79103

104+
<pre>
105+
<code class="language-html">
106+
107+
&lt;video
108+
id="player-default-profile"
109+
controls
110+
autoplay
111+
muted
112+
class="cld-video-player"
113+
width="500"&gt;
114+
&lt;/video&gt;
115+
116+
</code>
117+
<code class="language-javascript">
118+
window.addEventListener('load', async function() {
119+
const playerWithDefaultProfile = await cloudinary.player('player-default-profile', {
120+
cloudName: 'demo',
121+
profile: 'cld-default',
122+
});
123+
124+
playerWithDefaultProfile.source('sea_turtle');
125+
}, false);
126+
</code>
127+
</pre>
128+
129+
<h5>Player with custom profile</h5>
130+
<h3 class="mt-4">Example Code:</h3>
131+
80132
<pre>
81133
<code class="language-html">
82134

‎src/assets/styles/components/text-tracks.scss‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@
77
> div {
88
margin: 3% !important;
99
}
10+
// Word highlight
11+
&.cld-paced-text-tracks b {
12+
color: var(--color-accent);
13+
}
1014
}
1115
.vjs-text-track-cue {
1216
top: auto !important;

0 commit comments

Comments
 (0)