Merge branch 'main' into 132-section-separator

hlxsites · Dec 6, 2023 · 83ee21c · 83ee21c
2 parents 26ca696 + e5341c6
commit 83ee21c
Show file tree

Hide file tree

Showing 10 changed files with 12 additions and 68 deletions.
diff --git a/.eslintignore b/.eslintignore
@@ -1,2 +1 @@
 helix-importer-ui
-scripts/partytown
diff --git a/blocks/hero/search/home.js b/blocks/hero/search/home.js
@@ -5,12 +5,7 @@ import {
 function observeForm() {
   const script = document.createElement('script');
   script.type = 'module';
-  script.innerHTML = `
-    const script = document.createElement('script');
-    script.type = 'module';
-    script.src = '${window.hlx.codeBasePath}/blocks/hero/search/home-delayed.js';
-    document.head.append(script);
-  `;
+  script.src = `${window.hlx.codeBasePath}/blocks/hero/search/home-delayed.js`;
   document.head.append(script);
 }
 

diff --git a/blocks/liveby-map/liveby-map-delayed.js b/blocks/liveby-map/liveby-map-delayed.js
@@ -1,6 +1,5 @@
 /* global google */
-
-import { fetchPlaceholders } from '../../scripts/aem.js';
+import loadMaps from '../../scripts/google-maps/index.js';
 
 function getCenter(coords) {
   // Find bounding box
@@ -53,28 +52,6 @@ function initLiveByMap() {
   const poly = new google.maps.Polygon(polyOptions);
 }
 
-function loadJS(src) {
-  const script = document.createElement('script');
-  script.type = 'text/javascript';
-  script.async = true;
-  script.defer = true;
-  script.innerHTML = `
-    (()=>{
-      let script = document.createElement('script');
-      script.src = '${src}';
-      document.head.append(script);
-    })();
-  `;
-  document.head.append(script);
-}
-
-async function initGoogleMapsAPI() {
-  const placeholders = await fetchPlaceholders();
-  const CALLBACK_FN = 'initLiveByMap';
-  window[CALLBACK_FN] = initLiveByMap;
-  const { mapsApiKey } = placeholders;
-  const src = `https://maps.googleapis.com/maps/api/js?key=${mapsApiKey}&libraries=maps&callback=${CALLBACK_FN}`;
-  loadJS(src);
-}
-
-initGoogleMapsAPI();
+loadMaps();
+await window.google.maps.importLibrary('maps');
+initLiveByMap();
diff --git a/blocks/liveby-map/liveby-map.js b/blocks/liveby-map/liveby-map.js
@@ -1,23 +1,18 @@
 let alreadyDeferred = false;
-function initGoogleMapsAPI() {
+function initMap() {
   if (alreadyDeferred) {
     return;
   }
   alreadyDeferred = true;
   const script = document.createElement('script');
-  script.type = 'text/partytown';
-  script.innerHTML = `
-    const script = document.createElement('script');
-    script.type = 'module';
-    script.src = '${window.hlx.codeBasePath}/blocks/liveby-map/liveby-map-delayed.js';
-    document.head.append(script);
-  `;
+  script.type = 'module';
+  script.src = `${window.hlx.codeBasePath}/blocks/liveby-map/liveby-map-delayed.js`;
   document.head.append(script);
 }
 
 export default async function decorate(block) {
   const map = document.createElement('div');
   map.classList.add('liveby-map-main');
   block.replaceChildren(map);
-  initGoogleMapsAPI();
+  window.setTimeout(initMap, 3000);
 }
diff --git a/blocks/quote-carousel/quote-carousel.js b/blocks/quote-carousel/quote-carousel.js
@@ -29,16 +29,10 @@ function observeCarousel() {
   if (alreadyDeferred) {
     return;
   }
-
   alreadyDeferred = true;
   const script = document.createElement('script');
-  script.type = 'text/partytown';
-  script.innerHTML = `
-    const script = document.createElement('script');
-    script.type = 'module';
-    script.src = '${window.hlx.codeBasePath}/blocks/quote-carousel/quote-carousel-delayed.js';
-    document.head.append(script);
-  `;
+  script.type = 'module';
+  script.src = `${window.hlx.codeBasePath}/blocks/quote-carousel/quote-carousel-delayed.js`;
   document.head.append(script);
 }
 
@@ -94,6 +88,6 @@ export default async function decorate(block) {
       </div>
       <button name="next" aria-label="Next" class="control-button"><svg><use xlink:href="/icons/icons.svg#carrot"/></svg></button>
     `;
-    observeCarousel();
+    window.setTimeout(observeCarousel, 3000);
   }
 }
diff --git a/scripts/partytown/partytown-atomics.js b/scripts/partytown/partytown-atomics.js
diff --git a/scripts/partytown/partytown-media.js b/scripts/partytown/partytown-media.js
diff --git a/scripts/partytown/partytown-sw.js b/scripts/partytown/partytown-sw.js
diff --git a/scripts/partytown/partytown.js b/scripts/partytown/partytown.js
diff --git a/scripts/scripts.js b/scripts/scripts.js
@@ -294,13 +294,6 @@ export function addFavIcon(href) {
   }
 }
 
-function initPartytown() {
-  window.partytown = {
-    lib: '/scripts/partytown/',
-  };
-  import('./partytown/partytown.js');
-}
-
 /**
  * Loads everything that doesn't need to be delayed.
  * @param {Element} doc The container element
@@ -321,7 +314,6 @@ async function loadLazy(doc) {
   sampleRUM('lazy');
   sampleRUM.observe(main.querySelectorAll('div[data-block-name]'));
   sampleRUM.observe(main.querySelectorAll('picture > img'));
-  initPartytown();
 }
 
 /**