Merge branch 'master' into update-master-from-edge

cloudinary · Dec 9, 2024 · 68f1136 · 68f1136
2 parents 5c98ded + e159b38
commit 68f1136
Show file tree

Hide file tree

Showing 8 changed files with 131 additions and 6 deletions.
diff --git a/.github/workflows/release-manual.yml b/.github/workflows/release-manual.yml
@@ -0,0 +1,85 @@
+name: 🔧 Release (Manual)
+
+on:
+  workflow_dispatch:
+    inputs:
+      release-as:
+        description: 'Release Version'
+        required: true
+      release-type:
+        description: 'Release Type'
+        type: choice
+        required: true
+        default: 'edge'
+        options:
+          - edge
+          - latest
+
+jobs:
+  release:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          ref: ${{ github.event.inputs.release-type == 'latest' && 'master' || 'edge'}}
+
+      - run: npm ci
+
+      - name: Release PR
+        uses: google-github-actions/release-please-action@v3
+        id: release
+        with:
+          token: ${{ secrets.BOT_TOKEN }}
+          release-type: node
+          release-as: ${{ github.event.inputs.release-as }}
+          prerelease: ${{ github.event.inputs.release-type == 'edge'}}
+          default-branch: ${{ github.event.inputs.release-type == 'latest' && 'master' || 'edge'}}
+
+      # The logic below handles the npm publication:
+      - uses: actions/setup-node@v4
+        with:
+          node-version: '20.x'
+          registry-url: 'https://registry.npmjs.org'
+        if: ${{ steps.release.outputs.release_created }}
+        # these if statements ensure that a publication only occurs when
+        # a new release is created:
+      - run: npm run build-all
+        if: ${{ steps.release.outputs.release_created }}
+      - run: npm publish --tag ${{ github.event.inputs.release-type }}
+        env:
+          NODE_AUTH_TOKEN: ${{secrets.NPM_TOKEN}}
+        if: ${{ steps.release.outputs.release_created }}
+
+      - name: Set Notification Messages
+        id: set-messages
+        if: steps.release.outputs.release_created
+        run: |
+          if [[ ${{ job.status }} == "success" ]]; then
+            echo "SLACK_TITLE=Video Player ${{ steps.release.outputs.tag_name }} Deployed" >> $GITHUB_OUTPUT
+            echo "SLACK_MESSAGE=Success :rocket: cloudinary-video-player version ${{ steps.release.outputs.tag_name }} deployed successfully" >> $GITHUB_OUTPUT
+            echo "SLACK_FOOTER=Check it out at https://cloudinary.github.io/cloudinary-video-player/?ver=${{ github.event.inputs.release-type }}&min=true" >> $GITHUB_OUTPUT
+          else
+            echo "SLACK_TITLE=Video Player Deployment Failed" >> $GITHUB_OUTPUT
+            echo "SLACK_MESSAGE=:alert: Failed to deploy cloudinary-video-player version ${{ steps.release.outputs.tag_name }}" >> $GITHUB_OUTPUT
+            echo "SLACK_FOOTER=See log here https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}/job/${{ github.job }}" >> $GITHUB_OUTPUT
+          fi
+        shell: bash
+
+      - name: Slack Notification
+        if: steps.release.outputs.release_created
+        uses: rtCamp/action-slack-notify@v2.2.0
+        env:
+          SLACK_WEBHOOK: ${{ vars.FE_DEPLOYMENTS_SLACK_WEBHOOK }}
+          SLACK_CHANNEL: 'rnd-fe-releases'
+          SLACK_COLOR: ${{ job.status }}
+          SLACK_TITLE: ${{ steps.set-messages.outputs.SLACK_TITLE }}
+          SLACK_MESSAGE: ${{ steps.set-messages.outputs.SLACK_MESSAGE }}
+          SLACK_FOOTER: ${{ steps.set-messages.outputs.SLACK_FOOTER }}
+
+      - uses: gacts/purge-jsdelivr-cache@v1
+        if: steps.release.outputs.release_created
+        with:
+          url: |
+            https://cdn.jsdelivr.net/npm/cloudinary-video-player
+            https://cdn.jsdelivr.net/npm/cloudinary-video-player@edge
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,40 @@
 # Changelog
 
 
+## [2.1.1](https://github.com/cloudinary/cloudinary-video-player/compare/v2.1.0...v2.1.1) (2024-11-05)
+
+### Features
+
+* 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))
+* 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))
+
+### Bug Fixes
+
+* 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))
+
+## [2.1.0](https://github.com/cloudinary/cloudinary-video-player/compare/v2.0.5...v2.1.0) (2024-08-21)
+
+
+### Features
+
+* custom data video analytics param ([2aba293](https://github.com/cloudinary/cloudinary-video-player/commit/2aba293436035f2fedfcb51c3063913f1261d564))
+* new 'player' method with support async loading & profiles ([2aba293](https://github.com/cloudinary/cloudinary-video-player/commit/2aba293436035f2fedfcb51c3063913f1261d564))
+
+
+### Bug Fixes
+
+* update dependencies ([#688](https://github.com/cloudinary/cloudinary-video-player/issues/688)) ([2aba293](https://github.com/cloudinary/cloudinary-video-player/commit/2aba293436035f2fedfcb51c3063913f1261d564))
+
+## [2.0.5](https://github.com/cloudinary/cloudinary-video-player/compare/v2.0.4...v2.0.5) (2024-07-15)
+
+
+### Bug Fixes
+
+* chapters innerHTML to innerText ([#671](https://github.com/cloudinary/cloudinary-video-player/issues/671)) ([d9b6251](https://github.com/cloudinary/cloudinary-video-player/commit/d9b62513c7abe9eba3458c5193f178ebc6250543))
+* custom profile docs example ([#673](https://github.com/cloudinary/cloudinary-video-player/issues/673)) ([d9b6251](https://github.com/cloudinary/cloudinary-video-player/commit/d9b62513c7abe9eba3458c5193f178ebc6250543))
+* remove IE polyfill ([#665](https://github.com/cloudinary/cloudinary-video-player/issues/665)) ([d9b6251](https://github.com/cloudinary/cloudinary-video-player/commit/d9b62513c7abe9eba3458c5193f178ebc6250543))
+* 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))
+
 ## [2.0.4](https://github.com/cloudinary/cloudinary-video-player/compare/v2.0.3...v2.0.4) (2024-06-17)
 
 

diff --git a/docs/es-modules/interaction-area.html b/docs/es-modules/interaction-area.html
@@ -86,9 +86,10 @@ <h3>Auto-zoom video cropping</h3>
 
     <script type="module">
       import cloudinary from 'cloudinary-video-player/all';
-      import 'cloudinary-video-player/cld-video-player.min.css';
       import 'cloudinary-video-player/interaction-areas';
 
+      import 'cloudinary-video-player/cld-video-player.min.css';
+
       const playerOption = {
         cloudName: 'demo',
         bigPlayButton: false,

diff --git a/docs/es-modules/recommendations.html b/docs/es-modules/recommendations.html
@@ -36,9 +36,10 @@ <h3 class="mb-4">Recommendations</h3>
     </div>
 
     <script type="module">
+      import { videoPlayer } from 'cloudinary-video-player';
       import 'cloudinary-video-player/recommendations-overlay';
+
       import 'cloudinary-video-player/cld-video-player.min.css';
-      import { videoPlayer } from 'cloudinary-video-player';
 
       const source1 = {
         publicId: 'surf_competition',

diff --git a/docs/es-modules/shoppable.html b/docs/es-modules/shoppable.html
@@ -36,10 +36,11 @@ <h3 class="mb-4">Shoppable Videos</h3>
     </div>
 
     <script type="module">
-      import 'cloudinary-video-player/cld-video-player.min.css';
       import { videoPlayer } from 'cloudinary-video-player';
       import 'cloudinary-video-player/shoppable';
 
+      import 'cloudinary-video-player/cld-video-player.min.css';
+
       const player = videoPlayer('player', {
         cloudName: 'demo'
       });

diff --git a/docs/es-modules/subtitles-and-captions.html b/docs/es-modules/subtitles-and-captions.html
@@ -124,9 +124,10 @@ <h4 class="mt-4 mb-2">Translated Transcript</h4>
 
     <script type="module">
       import { videoPlayer } from 'cloudinary-video-player';
-      import 'cloudinary-video-player/cld-video-player.min.css';
       import 'cloudinary-video-player/playlist';
 
+      import 'cloudinary-video-player/cld-video-player.min.css';
+
       const player = videoPlayer('player', {
         cloudName: 'prod'
       });

diff --git a/docs/profiles.html b/docs/profiles.html
@@ -155,7 +155,6 @@ <h3 class="mt-4">Example Code:</h3>
 
   <pre>
     <code class="language-html">
-
       &lt;video
         id="player-custom-profile-overrides"
         controls
@@ -164,7 +163,6 @@ <h3 class="mt-4">Example Code:</h3>
         class="cld-video-player"
         width="500"&gt;
       &lt;/video&gt;
-
       </code>
       <code class="language-javascript">
         window.addEventListener('load', async function() {

diff --git a/src/assets/styles/components/text-tracks.scss b/src/assets/styles/components/text-tracks.scss
@@ -7,6 +7,10 @@
     > div {
       margin: 3% !important;
     }
+    // Word highlight
+    &.cld-paced-text-tracks b {
+      color: var(--color-accent);
+    }
   }
   .vjs-text-track-cue {
     top: auto !important;