Merge pull request #143 from sitegeist/bugfix/upgradeLicenses

[BUGFIX] #upgradeLicenses adapt iframe-resizer to match v5 API

Author: ulrichmathes

.pnp.cjs

@@ -39,7 +39,9 @@ FluidStyleguide:
             Css:
                 - EXT:fluid_styleguide/Resources/Public/Css/Iframe.css
             Javascript:
-                - EXT:fluid_styleguide/Resources/Public/Build/JavaScript/Iframe.min.js
+                -
+                    file: EXT:fluid_styleguide/Resources/Public/Build/JavaScript/Iframe.min.js
+                    type: module
         Packages:
             'Sitegeist\FluidStyleguide\DemoComponents':
                 Css:

.yarn/install-state.gz

@@ -1,4 +1,4 @@
-import 'iframe-resizer/js/iframeResizer.contentWindow';
+import '@iframe-resizer/child';
 
 // close select if clicked outside
 document.addEventListener('click', () => {

Configuration/Yaml/FluidStyleguide.yaml

@@ -1,4 +1,4 @@
-import "iframe-resizer/js/iframeResizer";
+import iframeResize from '@iframe-resizer/parent';
 
 import '../Components/Atom/StyleguideRefreshIFrame/StyleguideRefreshIFrame';
 import '../Components/Atom/StyleguideSelect/StyleguideSelect';
@@ -8,4 +8,7 @@ import '../Components/Atom/ViewportNavigation/ViewportNavigation';
 import '../Components/Atom/LanguageNavigation/LanguageNavigation';
 import '../Components/Molecule/EditFixtures/EditFixtures';
 
-iFrameResize({ heightCalculationMethod: 'taggedElement', warningTimeout: 0, license: 'GPLv3' }, '.iframeResize');
+iframeResize(
+    { heightCalculationMethod: 'taggedElement', warningTimeout: 0, license: 'GPLv3' },
+    '.iframeResize'
+);

Resources/Private/Javascript/Iframe.js

@@ -20,12 +20,12 @@
     </f:for>
     <f:for each="{styleguideConfiguration.globalJavascript}" as="javascriptFile">
         <f:if condition="{javascriptFile.position} == 'head'">
-            <script src="{f:if(condition: javascriptFile.file, then: javascriptFile.file, else: javascriptFile)}"></script>
+            <script src="{f:if(condition: javascriptFile.file, then: javascriptFile.file, else: javascriptFile)}" {f:if(condition: javascriptFile.type, then: 'type=\"{javascriptFile.type}\" ')}></script>
         </f:if>
     </f:for>
     <f:for each="{componentJavascript}" as="javascriptFile">
         <f:if condition="{javascriptFile.position} == 'head'">
-            <script src="{f:if(condition: javascriptFile.file, then: javascriptFile.file, else: javascriptFile)}"></script>
+            <script src="{f:if(condition: javascriptFile.file, then: javascriptFile.file, else: javascriptFile)}" {f:if(condition: javascriptFile.type, then: 'type=\"{javascriptFile.type}\" ')}></script>
         </f:if>
     </f:for>
     <!-- ###ADDITIONAL_HEADER_DATA### -->
@@ -48,12 +48,12 @@
 
 <f:for each="{styleguideConfiguration.globalJavascript}" as="javascriptFile">
     <f:if condition="{javascriptFile.position} != 'head'">
-        <script src="{f:if(condition: javascriptFile.file, then: javascriptFile.file, else: javascriptFile)}"></script>
+        <script src="{f:if(condition: javascriptFile.file, then: javascriptFile.file, else: javascriptFile)}" {f:if(condition: javascriptFile.type, then: 'type=\"{javascriptFile.type}\" ')}></script>
     </f:if>
 </f:for>
 <f:for each="{componentJavascript}" as="javascriptFile">
     <f:if condition="{javascriptFile.position} != 'head'">
-        <script src="{f:if(condition: javascriptFile.file, then: javascriptFile.file, else: javascriptFile)}"></script>
+        <script src="{f:if(condition: javascriptFile.file, then: javascriptFile.file, else: javascriptFile)}" {f:if(condition: javascriptFile.type, then: 'type=\"{javascriptFile.type}\" ')}></script>
     </f:if>
 </f:for>
 <!-- ###ADDITIONAL_FOOTER_DATA### -->

Resources/Private/Javascript/Styleguide.js

@@ -42,7 +42,7 @@
     <f:render section="Content" />
 </div>
 
-<script src="{styleguideConfiguration.styleguideJavascript}"></script>
+<script type="module" src="{styleguideConfiguration.styleguideJavascript}"></script>
 
 </body>
 </html>

Resources/Private/Layouts/Iframe.html

@@ -3,13 +3,19 @@
     "file": "JavaScript/Iframe.min.js",
     "name": "Iframe",
     "src": "Resources/Private/Javascript/Iframe.js",
-    "isEntry": true
+    "isEntry": true,
+    "imports": [
+      "_index-CTDsMjWk.js"
+    ]
   },
   "Resources/Private/Javascript/Styleguide.js": {
     "file": "JavaScript/Styleguide.min2.js",
     "name": "Styleguide",
     "src": "Resources/Private/Javascript/Styleguide.js",
-    "isEntry": true
+    "isEntry": true,
+    "imports": [
+      "_index-CTDsMjWk.js"
+    ]
   },
   "Resources/Private/Scss/Styleguide.scss": {
     "file": "Css/Styleguide.min.css",
@@ -18,5 +24,9 @@
     "names": [
       "Styleguide.css"
     ]
+  },
+  "_index-CTDsMjWk.js": {
+    "file": "JavaScript/Chunks/index-CTDsMjWk.js",
+    "name": "index"
   }
 }