Merge pull request #64 from asad-rafter/CLD-279-video-player-bump-up

CLD-279
cloudinary · Apr 1, 2024 · a1bbe7d · a1bbe7d
2 parents 168744c + b93a10f
commit a1bbe7d
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 43 deletions.
diff --git a/cartridges/bm_cloudinary_pd/cartridge/scripts/cloudinary/version.json b/cartridges/bm_cloudinary_pd/cartridge/scripts/cloudinary/version.json
@@ -1,3 +1,4 @@
 {
+    "videoPlayerVersion": "1.10.1",
     "version": "24.1.1"
 }
diff --git a/...oudinary_pd/cartridge/templates/default/experience/components/assets/cloudinaryImage.isml b/...oudinary_pd/cartridge/templates/default/experience/components/assets/cloudinaryImage.isml
@@ -6,17 +6,6 @@
 <isscript>
     // SFRA has a logic bug where full urls are added twice, so we need to check for duplicates before adding.
     assets = require('*/cartridge/scripts/assets.js');
-    // Cloudinary Core JS
-    var src = 'https://unpkg.com/cloudinary-core/cloudinary-core-shrinkwrap.min.js';
-    if (assets.scripts.lastIndexOf(src) < 0) {
-        assets.addJs(src);
-    }
-
-    // Cloudinary Gallery JS Url to render CLD Gallery on PDP
-    src = 'https://product-gallery.cloudinary.com/all.js';
-    if (assets.scripts.lastIndexOf(src) < 0) {
-        assets.addJs(src);
-    }
     assets.addJs('js/cloudinaryImages.js');
 </isscript>
 

diff --git a/...oudinary_pd/cartridge/templates/default/experience/components/assets/cloudinaryVideo.isml b/...oudinary_pd/cartridge/templates/default/experience/components/assets/cloudinaryVideo.isml
@@ -7,42 +7,31 @@
 <isscript>
 	// SFRA has a logic bug where full urls are added twice, so we need to check for duplicates before adding.
     var assets = require('*/cartridge/scripts/assets.js');
+	var verJson = require('*/cartridge/scripts/cloudinary/version.json');
+
 
 	// Video Player CSS
-	var src = 'https://unpkg.com/cloudinary-video-player@1.10.4/dist/cld-video-player.min.css';
+    var src = 'https://unpkg.com/cloudinary-video-player@'+verJson.videoPlayerVersion+'/dist/cld-video-player.min.css';
     if (assets.styles.lastIndexOf(src) < 0) {
     	assets.addCss(src);
 	}
 
-	// Cloudinary Core JS
-	src = 'https://unpkg.com/cloudinary-core/cloudinary-core-shrinkwrap.min.js';
-    if (assets.scripts.lastIndexOf(src) < 0) {
-    	assets.addJs(src);
-	}
-
 	// Cloudinary Video Player JS
-	src = 'https://unpkg.com/cloudinary-video-player@1.10.4/dist/cld-video-player.min.js';
+    src = 'https://unpkg.com/cloudinary-video-player@'+verJson.videoPlayerVersion+'/dist/cld-video-player.min.js';
     if (assets.scripts.lastIndexOf(src) < 0) {
 		assets.addJs(src);
 	}
 
-	// Cloudinary Gallery JS Url to render CLD Gallery on PDP
-    src = 'https://product-gallery.cloudinary.com/all.js';
-    if (assets.scripts.lastIndexOf(src) < 0) {
-        assets.addJs(src);
-    }
-
     assets.addJs('/js/cloudinaryVideos.js');
 </isscript>
 
 <div class="cloudinary-video-container sfdc-component-mock sfdc-component-assets-media_library_video-mock">
-    <video id="${pdict.viewmodel.id}"></video>
-<script>
+	<video id="${pdict.viewmodel.id}"></video>
+	<script>
   var value = JSON.parse('<isprint value="${JSON.stringify(pdict.viewmodel)}" encoding="jsonvalue"/>');
   window.players = window.players || [];
   window.players.push(value);
   window.cloudName = value.cloudName;
   window.cname = value.cname || null;
 </script>
 </div>
-
diff --git a/example/cld_custom_i9n/cartridge/templates/default/experience/components/assets/example.isml b/example/cld_custom_i9n/cartridge/templates/default/experience/components/assets/example.isml
@@ -3,11 +3,6 @@
 <isscript>
     // SFRA has a logic bug where full urls are added twice, so we need to check for duplicates before adding.
     assets = require('*/cartridge/scripts/assets.js');
-    // Cloudinary Core JS
-    var src = 'https://unpkg.com/cloudinary-core/cloudinary-core-shrinkwrap.min.js';
-    if (assets.scripts.lastIndexOf(src) < 0) {
-        assets.addJs(src);
-    }
     assets.addJs('*/js/cloudinaryImages.js');
 </isscript>
 

diff --git a/...cld_custom_i9n/cartridge/templates/default/experience/components/assets/videoExample.isml b/...cld_custom_i9n/cartridge/templates/default/experience/components/assets/videoExample.isml
@@ -3,21 +3,17 @@
 <isscript>
     // SFRA has a logic bug where full urls are added twice, so we need to check for duplicates before adding.
     var assets = require('*/cartridge/scripts/assets.js');
+	var verJson = require('*/cartridge/scripts/cloudinary/version.json');
+
 
     // Video Player CSS
-    var src = 'https://unpkg.com/cloudinary-video-player@1.8.0/dist/cld-video-player.min.css';
+    var src = 'https://unpkg.com/cloudinary-video-player@'+verJson.videoPlayerVersion+'/dist/cld-video-player.min.css';
     if (assets.styles.lastIndexOf(src) < 0) {
         assets.addCss(src);
     }
 
-    // Cloudinary Core JS
-    src = 'https://unpkg.com/cloudinary-core/cloudinary-core-shrinkwrap.min.js';
-    if (assets.scripts.lastIndexOf(src) < 0) {
-        assets.addJs(src);
-    }
-
     // Cloudinary Video Player JS
-    src = 'https://unpkg.com/cloudinary-video-player@1.8.0/dist/cld-video-player.min.js';
+    src = 'https://unpkg.com/cloudinary-video-player@'+verJson.videoPlayerVersion+'/dist/cld-video-player.min.js';
     if (assets.scripts.lastIndexOf(src) < 0) {
         assets.addJs(src);
     }
@@ -34,7 +30,6 @@
       window.players.push(value);
       window.cloudName = value.cloudName;
       window.cname = value.cname || null;
-      console.log(value);
     </script>
 </div>
 
diff --git a/metadata/helpers/enum_gen.js b/metadata/helpers/enum_gen.js
@@ -18,7 +18,6 @@ const run = () => {
       xml = xml.concat(defTemplate.replace('__NAME__', name).replace('__VAL__', val));
     }
     xml = xml.concat('</value-definitions>');
-    console.log(xml);
     process.exit();
   } else {
     console.log('Useage --in= path to values json --prefix= value prefix');