Merge branch 'master' into dependabot/npm_and_yarn/min-document-2.19.2

tsi · web-flow · commit b1c24475e040 · 2025-12-10T09:52:27.000+02:00
diff --git a/.github/workflows/npm-publish.yml b/.github/workflows/npm-publish.yml
@@ -0,0 +1,56 @@
+name: 📦 NPM Publish
+
+on:
+  workflow_call:
+    inputs:
+      tag:
+        description: 'NPM tag to publish with (e.g., "edge"). Leave empty for latest.'
+        required: false
+        type: string
+        default: ''
+      ref:
+        description: 'Git ref to checkout (branch, tag, or SHA). Leave empty for default.'
+        required: false
+        type: string
+        default: ''
+  workflow_dispatch:
+    inputs:
+      tag:
+        description: 'NPM tag to publish with (e.g., "edge"). Leave empty for latest.'
+        required: false
+        type: string
+        default: ''
+      ref:
+        description: 'Git ref to checkout (branch, tag, or SHA). Leave empty for default.'
+        required: false
+        type: string
+        default: ''
+
+jobs:
+  publish:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      id-token: write
+
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          ref: ${{ inputs.ref || github.ref }}
+
+      - uses: actions/setup-node@v4
+        with:
+          node-version: '20.x'
+          registry-url: 'https://registry.npmjs.org'
+
+      - run: npm ci
+
+      - run: npm run build-all
+
+      - name: Publish to NPM
+        run: |
+          if [ -n "${{ inputs.tag }}" ]; then
+            npm publish --tag ${{ inputs.tag }} --provenance --access public
+          else
+            npm publish --provenance --access public
+          fi
diff --git a/.github/workflows/release-edge.yml b/.github/workflows/release-edge.yml
@@ -7,8 +7,13 @@ on:
   workflow_dispatch:
 
 jobs:
-  release:
+  prepare:
     runs-on: ubuntu-latest
+    permissions:
+      contents: write
+    outputs:
+      edge_branch: ${{ steps.get_next_version.outputs.version }}-edge
+      new_version: ${{ steps.bump_version.outputs.new_version }}
 
     steps:
       - uses: actions/checkout@v4
@@ -62,24 +67,34 @@ jobs:
         run: |
           git push origin ${{ steps.get_next_version.outputs.version }}-edge
 
-      - run: npm run build-all
+  publish:
+    needs: prepare
+    uses: ./.github/workflows/npm-publish.yml
+    with:
+      tag: edge
+      ref: ${{ needs.prepare.outputs.edge_branch }}
 
-      - name: Publish ${{ steps.bump_version.outputs.new_version }}
-        run: npm publish --tag edge
-        env:
-          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
+  notify:
+    needs: [prepare, publish]
+    if: always()
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v4
 
       - name: Set Notification Messages
         id: set-messages
         run: |
-          if [[ ${{ job.status }} == "success" ]]; then
-            echo "SLACK_TITLE=Video Player ${{ steps.bump_version.outputs.new_version }} Deployed" >> $GITHUB_OUTPUT
-            echo "SLACK_MESSAGE=Success :rocket: cloudinary-video-player version ${{ steps.bump_version.outputs.new_version }} deployed successfully" >> $GITHUB_OUTPUT
+          if [[ "${{ needs.publish.result }}" == "success" ]]; then
+            echo "SLACK_TITLE=Video Player ${{ needs.prepare.outputs.new_version }} Deployed" >> $GITHUB_OUTPUT
+            echo "SLACK_MESSAGE=Success :rocket: cloudinary-video-player version ${{ needs.prepare.outputs.new_version }} deployed successfully" >> $GITHUB_OUTPUT
             echo "SLACK_FOOTER=Check it out at https://cloudinary.github.io/cloudinary-video-player/?ver=edge&min=true" >> $GITHUB_OUTPUT
+            echo "SLACK_COLOR=good" >> $GITHUB_OUTPUT
           else
             echo "SLACK_TITLE=Video Player Deployment Failed" >> $GITHUB_OUTPUT
-            echo "SLACK_MESSAGE=:alert: Failed to deploy cloudinary-video-player version ${{ steps.bump_version.outputs.new_version }}" >> $GITHUB_OUTPUT
-            echo "SLACK_FOOTER=See log here https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}/job/${{ github.job }}" >> $GITHUB_OUTPUT
+            echo "SLACK_MESSAGE=:alert: Failed to deploy cloudinary-video-player version ${{ needs.prepare.outputs.new_version }}" >> $GITHUB_OUTPUT
+            echo "SLACK_FOOTER=See log here https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}" >> $GITHUB_OUTPUT
+            echo "SLACK_COLOR=danger" >> $GITHUB_OUTPUT
           fi
         shell: bash
 
@@ -88,12 +103,13 @@ jobs:
         env:
           SLACK_WEBHOOK: ${{ vars.FE_DEPLOYMENTS_SLACK_WEBHOOK }}
           SLACK_CHANNEL: 'rnd-fe-releases'
-          SLACK_COLOR: ${{ job.status }}
+          SLACK_COLOR: ${{ steps.set-messages.outputs.SLACK_COLOR }}
           SLACK_TITLE: ${{ steps.set-messages.outputs.SLACK_TITLE }}
           SLACK_MESSAGE: ${{ steps.set-messages.outputs.SLACK_MESSAGE }}
           SLACK_FOOTER: ${{ steps.set-messages.outputs.SLACK_FOOTER }}
 
       - name: Purge jsDelivr Cache
+        if: ${{ needs.publish.result == 'success' }}
         uses: ./.github/actions/purge-jsdelivr
         with:
           package: cloudinary-video-player@edge
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -9,6 +9,12 @@ on:
 jobs:
   release:
     runs-on: ubuntu-latest
+    permissions:
+      contents: write
+      pull-requests: write
+    outputs:
+      release_created: ${{ steps.release.outputs.release_created }}
+      tag_name: ${{ steps.release.outputs.tag_name }}
 
     steps:
       - uses: actions/checkout@v4
@@ -23,49 +29,47 @@ jobs:
           release-type: node
           default-branch: master
 
-      # The logic below handles the npm publication:
-      - uses: actions/setup-node@v4
-        with:
-          node-version: '20.x'
-          registry-url: 'https://registry.npmjs.org'
-        # these if statements ensure that a publication only occurs when
-        # a new release is created:
-        if: ${{ steps.release.outputs.release_created }}
-      - run: npm run build-all
-        if: ${{ steps.release.outputs.release_created }}
-      - run: npm publish
-        env:
-          NODE_AUTH_TOKEN: ${{secrets.NPM_TOKEN}}
-        if: ${{ steps.release.outputs.release_created }}
+  publish:
+    needs: release
+    if: ${{ needs.release.outputs.release_created == 'true' }}
+    uses: ./.github/workflows/npm-publish.yml
+
+  notify:
+    needs: [release, publish]
+    if: ${{ always() && needs.release.outputs.release_created == 'true' }}
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v4
 
       - name: Set Notification Messages
-        if: steps.release.outputs.release_created
         id: set-messages
         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
+          if [[ "${{ needs.publish.result }}" == "success" ]]; then
+            echo "SLACK_TITLE=Video Player ${{ needs.release.outputs.tag_name }} Deployed" >> $GITHUB_OUTPUT
+            echo "SLACK_MESSAGE=Success :rocket: cloudinary-video-player version ${{ needs.release.outputs.tag_name }} deployed successfully" >> $GITHUB_OUTPUT
             echo "SLACK_FOOTER=Check it out at https://cloudinary.github.io/cloudinary-video-player/?ver=latest&min=true" >> $GITHUB_OUTPUT
+            echo "SLACK_COLOR=good" >> $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
+            echo "SLACK_MESSAGE=:alert: Failed to deploy cloudinary-video-player version ${{ needs.release.outputs.tag_name }}" >> $GITHUB_OUTPUT
+            echo "SLACK_FOOTER=See log here https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}" >> $GITHUB_OUTPUT
+            echo "SLACK_COLOR=danger" >> $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_COLOR: ${{ steps.set-messages.outputs.SLACK_COLOR }}
           SLACK_TITLE: ${{ steps.set-messages.outputs.SLACK_TITLE }}
           SLACK_MESSAGE: ${{ steps.set-messages.outputs.SLACK_MESSAGE }}
           SLACK_FOOTER: ${{ steps.set-messages.outputs.SLACK_FOOTER }}
 
       - name: Purge jsDelivr Cache
-        if: steps.release.outputs.release_created
+        if: ${{ needs.publish.result == 'success' }}
         uses: ./.github/actions/purge-jsdelivr
         with:
           package: cloudinary-video-player
diff --git a/src/utils/get-analytics-player-options.js b/src/utils/get-analytics-player-options.js
@@ -1,6 +1,5 @@
 import defaults from 'config/defaults';
 import isEmpty from 'lodash/isEmpty';
-import isObject from 'lodash/isObject';
 
 const hasConfig = (obj) => isEmpty(obj) ? null : true;
 
@@ -44,7 +43,7 @@ const getSourceOptions = (sourceOptions = {}) => ({
   } : {}),
   ...(hasConfig(sourceOptions.textTracks) ? getTextTracksOptions(sourceOptions.textTracks) : {}),
   interactionAreas: hasConfig(sourceOptions.interactionAreas),
-  videoSources: !!sourceOptions.videoSources || null,
+  videoSources: hasConfig(sourceOptions.videoSources),
 });
 
 const getTextTracksOptions = (textTracks = {}) => {
@@ -96,8 +95,7 @@ export const getAnalyticsFromPlayerOptions = (playerOptions) => filterDefaultsAn
   autoplayMode: playerOptions.autoplayMode,
   bigPlayButton: playerOptions.bigPlayButton,
   className: playerOptions.class,
-  cloudinaryAnalytics: !!playerOptions.cloudinaryAnalytics,
-  cloudinaryAnalyticsOptions: isObject(playerOptions.cloudinaryAnalytics) || null,
+  cloudinaryAnalytics: hasConfig(playerOptions.cloudinaryAnalytics),
   controls: playerOptions.controls,
   floatingWhenNotVisible: playerOptions.floatingWhenNotVisible,
   fluid: playerOptions.fluid,
@@ -126,8 +124,8 @@ export const getAnalyticsFromPlayerOptions = (playerOptions) => filterDefaultsAn
   debug: playerOptions.debug,
   type: playerOptions.type,
 
-  colors: playerOptions.colors && JSON.stringify(playerOptions.colors),
-  controlBar: (JSON.stringify(playerOptions.controlBar) !== JSON.stringify(defaults.controlBar)) && JSON.stringify(playerOptions.controlBar),
+  colors: hasConfig(playerOptions.colors),
+  controlBar: hasConfig(playerOptions.controlBar),
 
   ...getSourceOptions(playerOptions.sourceOptions || {}),
   ...getAdsOptions(playerOptions.ads),
