Merge pull request #164 from magento-atwix-pyrrans/delivery-bunch-w18

[Pyrrans] Delivery bunch 2022`W18

Author: andrewbess

app/code/Magento/PageBuilder/Test/Mftf/Data/BackgroundFormData.xml

@@ -598,21 +598,21 @@
         <data key="section">background</data>
         <data key="fieldName">video_source</data>
         <data key="value">https://www.youtube.com/embed/slOtnjsbff0</data>
-        <data key="renderedValue">https://www.youtube.com/embed/slOtnjsbff0</data>
+        <data key="renderedValue">https://www.youtube-nocookie.com/embed/slOtnjsbff0</data>
     </entity>
     <entity name="PageBuilderVideoBackgroundUrl_YouTube_NonEmbedded" type="pagebuilder_video_background_url">
         <data key="name">Video URL</data>
         <data key="section">background</data>
         <data key="fieldName">video_source</data>
         <data key="value">https://www.youtube.com/watch?v=slOtnjsbff0</data>
-        <data key="renderedValue">https://www.youtube.com/embed/slOtnjsbff0</data>
+        <data key="renderedValue">https://www.youtube-nocookie.com/embed/slOtnjsbff0</data>
     </entity>
     <entity name="PageBuilderVideoBackgroundUrl_YouTube_Insecure" type="pagebuilder_video_background_url">
         <data key="name">Video URL</data>
         <data key="section">background</data>
         <data key="fieldName">video_source</data>
         <data key="value">http://www.youtube.com/watch?v=slOtnjsbff0</data>
-        <data key="renderedValue">https://www.youtube.com/embed/slOtnjsbff0</data>
+        <data key="renderedValue">https://www.youtube-nocookie.com/embed/slOtnjsbff0</data>
     </entity>
     <entity name="PageBuilderVideoBackgroundUrl_Vimeo_Embedded" type="pagebuilder_video_background_url">
         <data key="name">Video URL</data>

app/code/Magento/PageBuilder/etc/csp_whitelist.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<csp_whitelist xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Csp:etc/csp_whitelist.xsd">
+    <policies>
+        <policy id="connect-src">
+            <values>
+                <value id="vimeo" type="host">vimeo.com</value>
+            </values>
+        </policy>
+        <policy id="frame-src">
+            <values>
+                <value id="youtube" type="host">*.youtube.com</value>
+                <value id="youtube_nocookie" type="host">*.youtube-nocookie.com</value>
+            </values>
+        </policy>
+    </policies>
+</csp_whitelist>

app/code/Magento/PageBuilder/view/base/requirejs-config.js

@@ -10,15 +10,16 @@ var config = {
             'jarallax': 'Magento_PageBuilder/js/resource/jarallax/jarallax',
             'jarallaxVideo': 'Magento_PageBuilder/js/resource/jarallax/jarallax-video',
             'Magento_PageBuilder/js/resource/vimeo/player': 'vimeo/player',
-            'Magento_PageBuilder/js/resource/vimeo/vimeo-wrapper': 'vimeo/vimeo-wrapper'
+            'Magento_PageBuilder/js/resource/vimeo/vimeo-wrapper': 'vimeo/vimeo-wrapper',
+            'jarallax-wrapper': 'Magento_PageBuilder/js/resource/jarallax/jarallax-wrapper'
         }
     },
     shim: {
         'Magento_PageBuilder/js/resource/slick/slick': {
             deps: ['jquery']
         },
         'Magento_PageBuilder/js/resource/jarallax/jarallax-video': {
-            deps: ['jarallax', 'vimeoWrapper']
+            deps: ['jarallax-wrapper', 'vimeoWrapper']
         }
     }
 };