From 8533470dd83d8411a44f52cec866a0c48244e6d9 Mon Sep 17 00:00:00 2001
From: GitHub Action <action@github.com>
Date: Thu, 12 Oct 2023 18:56:49 +0000
Subject: [PATCH] Squashed 'template/pages/' changes from cc80d0c..bb42fb8

bb42fb8 Update with https://github.com/ecomplus/storefront/commit/d3229943c021a138101e0fbbf1988c3537802d0c
68798dc Update with @ecomplus/storefront-template v2.0.0-beta.244

git-subtree-dir: template/pages
git-subtree-split: bb42fb831708cee7e1b921f0ff474c6df138905c
---
 @/layout/inc/logo.ejs     | 2 +-
 @/meta.ejs                | 4 ++++
 @/scripts.ejs             | 2 +-
 @/sections/blog.ejs       | 2 +-
 @/sections/inc/banner.ejs | 4 ++--
 @/sections/stamps.ejs     | 2 +-
 app/index.ejs             | 2 +-
 7 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/@/layout/inc/logo.ejs b/@/layout/inc/logo.ejs
index c8da24ae..7233fc67 100644
--- a/@/layout/inc/logo.ejs
+++ b/@/layout/inc/logo.ejs
@@ -1,7 +1,7 @@
 <%
 // store logo object
 const logo = _.settings.logo
-  ? { url: _.settings.logo, alt: _.settings.name }
+  ? { url: (_.assetsPrefix || '') + _.settings.logo, alt: _.settings.name }
   : _.store.logo
   
 if (logo && logo.url) {
diff --git a/@/meta.ejs b/@/meta.ejs
index e437217f..7d30711e 100644
--- a/@/meta.ejs
+++ b/@/meta.ejs
@@ -125,6 +125,10 @@ if (pathname) {
   }
   %>
 
+  <% if (_.assetsPrefix) { %>
+    <link rel="preconnect" href="<%= _.assetsPrefix || '' %>/" crossorigin>
+    <link rel="dns-prefetch" href="<%= _.assetsPrefix || '' %>/">
+  <% } %>
   <link rel="preconnect" href="https://cdn.jsdelivr.net/" crossorigin>
   <link rel="dns-prefetch" href="https://cdn.jsdelivr.net/">
   <% if (resource) { %>
diff --git a/@/scripts.ejs b/@/scripts.ejs
index 7490ef69..79456d90 100644
--- a/@/scripts.ejs
+++ b/@/scripts.ejs
@@ -30,7 +30,7 @@
   </script>
 <% } %>
 
-<script src="/<%= _.route.path.startsWith('/app/') ? 'checkout' : 'storefront' %>.js"></script>
+<script src="<%= _.assetsPrefix || '' %>/<%= _.route.path.startsWith('/app/') ? 'checkout' : 'storefront' %>.js"></script>
 
 <%
 if (Array.isArray(_.widgets) && _.widgets.length) {
diff --git a/@/sections/blog.ejs b/@/sections/blog.ejs
index 4bd1f204..26665160 100644
--- a/@/sections/blog.ejs
+++ b/@/sections/blog.ejs
@@ -24,7 +24,7 @@ if (Array.isArray(posts) && posts.length) {
                 <% if (thumbnail) { %>
                   <a href="/posts/<%= slug %>">
                     <img
-                      src="<%= thumbnail %>"
+                      src="<%= _.assetsPrefix || '' %><%= thumbnail %>"
                       class="card-img-top"
                       alt="<%= title %>"
                     >
diff --git a/@/sections/inc/banner.ejs b/@/sections/inc/banner.ejs
index 66d5a724..17e87e2d 100644
--- a/@/sections/inc/banner.ejs
+++ b/@/sections/inc/banner.ejs
@@ -34,7 +34,7 @@ if (opt.img) {
           class="img-fluid"
         <% } else { %>
           class="lozad fade img-fluid"
-          data-iesrc="<%= opt.img.replace('.webp', '.png') %>"
+          data-iesrc="<%= _.assetsPrefix || '' %><%= opt.img.replace('.webp', '.png') %>"
           data-alt="<%= opt.alt %>"
         <% } %>
         <% if (!opt.height_auto && width) { %>
@@ -57,7 +57,7 @@ if (opt.img) {
         <% }) %>
         <% if (opt.sync_load) { %>
           <img
-            src="<%= opt.img.replace('.webp', '.png') %>"
+            src="<%= _.assetsPrefix || '' %><%= opt.img.replace('.webp', '.png') %>"
             alt="<%= opt.alt %>"
             <% if (width) { %>
               width="<%= width %>"
diff --git a/@/sections/stamps.ejs b/@/sections/stamps.ejs
index 8bcd00be..a5f1fbf5 100644
--- a/@/sections/stamps.ejs
+++ b/@/sections/stamps.ejs
@@ -2,7 +2,7 @@
   <ul class="stamps">
     <% opt.stamps.forEach(({ src, alt, link, ...dimensions }) => {
       const { width, height } = _.tryImageSize(src, dimensions)
-      const imgHtml = `<img data-src="${src}" alt="${alt}" class="lozad fade"` +
+      const imgHtml = `<img data-src="${(_.assetsPrefix || '')}${src}" alt="${alt}" class="lozad fade"` +
         (width ? ` data-preload width="${width}" height="${height}">` : '>')
       %>
 
diff --git a/app/index.ejs b/app/index.ejs
index 554cf4d3..5adca039 100644
--- a/app/index.ejs
+++ b/app/index.ejs
@@ -2,7 +2,7 @@
 const contacts = _.cms('contacts') || {}
 const footer = _.cms('footer') || {}
 const logo = _.settings.logo
-  ? { url: _.settings.logo, alt: _.settings.name }
+  ? { url: (_.assetsPrefix || '') + _.settings.logo, alt: _.settings.name }
   : _.store.logo
 %>