hexo-theme-volantis 5.8.0 → 6.0.0

package/layout/_plugins/aplayer/script.ejs

@@ -1,74 +1,102 @@
 <script>
-  volantis.css("<%- theme.plugins.aplayer.css %>");
-  (async () => {
-    // APlayer 需要在  MetingJS 之前加载
-    await volantis.js("<%- theme.plugins.aplayer.js.aplayer %>")
-    await volantis.js("<%- theme.plugins.aplayer.js.meting %>")
-  <% if ((theme.rightmenu.enable || theme.rightmenus.enable) && theme.rightmenu.layout.includes('music')) { %>
-    // 右键 music 需要在 APlayer  MetingJS 之后加载
-    await volantis.js('<%- theme.cdn.addJS("plugins/aplayer") %>')
-  <% } %>
-  })();
+  volantis.css("<%- theme.cdn.aplayer_css %>");
 
-  function SetAPlayerPlugin(){
-    let Metings = document.querySelectorAll('meting-js');
-    if (Metings.length === 0) {return;};
-    if (Metings[0].aplayer && Metings[0].aplayer.on) {
-      // improve the accessibility https://web.dev/button-name/
-      document.querySelectorAll(".aplayer-icon-menu").forEach(e=>{
-        e.setAttribute("aria-label","Aplayer Menu")
-      })
-      // message see: /layout/_plugins/message/script.ejs
-      <% if (theme.plugins.message.enable && theme.plugins.message.aplayer.enable) { %>
-        try {
-          setTimeout(() => {
-            Metings.forEach((item, index) => {
-              const aplayerItem = item.aplayer; if(!aplayerItem) return;
-              const rightAplayerCheck = '<%= theme.rightmenu.layout.includes("music") %>' === 'true'
-                && item.meta.id === '<%= theme.plugins.aplayer.id %>';
-              if(rightAplayerCheck && typeof RightMenuAplayer !="undefined") RightMenuAplayer.checkAPlayer();
-              if(aplayerItem.events.events.play.every(item => {return item.name !== 'messagePlay'})) {
-                aplayerItem.on('play', function messagePlay() {
-                  let index = aplayerItem.list.index;
-                  let title = aplayerItem.list.audios[index].title;
-                  let artist = aplayerItem.list.audios[index].artist;
-                  setTimeout(() => {
-                    VolantisApp.message('音乐通知', title + ' - ' + artist, {
-                      icon: '<%- theme.plugins.message.aplayer.play %>',
-                      transitionIn: 'flipInX',
-                      transitionOut: 'flipOutX'
-                    });
-                  }, 100)
-                });
-              }
-              if(aplayerItem.events.events.pause.every(item => {return item.name !== 'messagePause'})) {
-                aplayerItem.on('pause', function messagePause() {
-                  let index = aplayerItem.list.index;
-                  let title = aplayerItem.list.audios[index].title;
-                  let artist = aplayerItem.list.audios[index].artist;
-                  setTimeout(() => {
-                    // 歌曲播放结束也会触发 pause 事件，为了避免错误提示，等待一会儿
-                    if(aplayerItem.paused) {
+  <% if (theme.plugins.aplayer.source == "meting") { %>
+    (async () => {
+      // APlayer 需要在  MetingJS 之前加载
+      await volantis.js("<%- theme.cdn.aplayer_js %>")
+      await volantis.js("<%- theme.cdn.meting %>")
+    <% if (theme.rightmenus.enable && theme.rightmenus.order.includes('music')) { %>
+      // 右键 music 需要在 APlayer  MetingJS 之后加载
+      await volantis.js('<%- theme.cdn.volantis_aplayer %>')
+    <% } %>
+    })();
+
+    function SetAPlayerPlugin(){
+      let Metings = document.querySelectorAll('meting-js');
+      if (Metings.length === 0) {return;};
+      if (Metings[0].aplayer && Metings[0].aplayer.on) {
+        // improve the accessibility https://web.dev/button-name/
+        document.querySelectorAll(".aplayer-icon-menu").forEach(e=>{
+          e.setAttribute("aria-label","Aplayer Menu")
+        })
+        // message see: /layout/_plugins/message/script.ejs
+        <% if (theme.plugins.message.enable && theme.plugins.message.aplayer.enable) { %>
+          try {
+            setTimeout(() => {
+              Metings.forEach((item, index) => {
+                const aplayerItem = item.aplayer; if(!aplayerItem) return;
+                const rightAplayerCheck = '<%= theme.rightmenus.order.includes("music") %>' === 'true'
+                  && item.meta.id === '<%= theme.plugins.aplayer.id %>';
+                if(rightAplayerCheck && typeof RightMenuAplayer !="undefined") RightMenuAplayer.checkAPlayer();
+                if(aplayerItem.events.events.play.every(item => {return item.name !== 'messagePlay'})) {
+                  aplayerItem.on('play', function messagePlay() {
+                    let index = aplayerItem.list.index;
+                    let title = aplayerItem.list.audios[index].title;
+                    let artist = aplayerItem.list.audios[index].artist;
+                    setTimeout(() => {
                       VolantisApp.message('音乐通知', title + ' - ' + artist, {
-                        icon: '<%- theme.plugins.message.aplayer.pause %>',
+                        icon: '<%- theme.plugins.message.aplayer.play %>',
                         transitionIn: 'flipInX',
                         transitionOut: 'flipOutX'
                       });
-                    }
-                  }, 100)
-                });
-              }
-            });
-          }, 500)
-        } catch (error) { console.error(error); }
-      <% } %>
-    }else{
-      volantis.requestAnimationFrame(SetAPlayerPlugin)
+                    }, 100)
+                  });
+                }
+                if(aplayerItem.events.events.pause.every(item => {return item.name !== 'messagePause'})) {
+                  aplayerItem.on('pause', function messagePause() {
+                    let index = aplayerItem.list.index;
+                    let title = aplayerItem.list.audios[index].title;
+                    let artist = aplayerItem.list.audios[index].artist;
+                    setTimeout(() => {
+                      // 歌曲播放结束也会触发 pause 事件，为了避免错误提示，等待一会儿
+                      if(aplayerItem.paused) {
+                        VolantisApp.message('音乐通知', title + ' - ' + artist, {
+                          icon: '<%- theme.plugins.message.aplayer.pause %>',
+                          transitionIn: 'flipInX',
+                          transitionOut: 'flipOutX'
+                        });
+                      }
+                    }, 100)
+                  });
+                }
+              });
+            }, 500)
+          } catch (error) { console.error(error); }
+        <% } %>
+      }else{
+        volantis.requestAnimationFrame(SetAPlayerPlugin)
+      }
     }
-  }
 
-  document.addEventListener("DOMContentLoaded", ()=>{
-    SetAPlayerPlugin();
-  });
-  volantis.pjax.push(SetAPlayerPlugin);
+    document.addEventListener("DOMContentLoaded", ()=>{
+      SetAPlayerPlugin();
+    });
+    volantis.pjax.push(SetAPlayerPlugin);
+  <% } else { %>
+    volantis.js("<%- theme.cdn.aplayer_js %>").then(()=>{
+      document.querySelectorAll('.aplayer-local').forEach(e=>{
+        new APlayer({
+          container: e,
+          fixed: <%- theme.plugins.aplayer.fixed %>,
+          order: "<%-theme.plugins.aplayer.order %>",
+          volume: "<%-theme.plugins.aplayer.volume %>",
+          autoplay: <%-theme.plugins.aplayer.autoplay %>,
+          loop: "<%-theme.plugins.aplayer.loop %>",
+          theme: "<%-theme.plugins.aplayer.theme %>",
+          listMaxHeight: "<%-theme.plugins.aplayer.list_max_height %>",
+          listFolded: "<%-theme.plugins.aplayer.list_folded %>",
+          preload: 'auto',
+          lrcType: 3,
+          audio: <%- JSON.stringify(theme.plugins.aplayer.audio) %>
+        });
+      })
+
+      // post.music 迷你模式 pjax todo...
+      // document.querySelectorAll('.aplayer-local-min').forEach(e=>{
+      //   // todo...
+      // })
+      // 右键 todo...
+    })
+  <% }  %>
 </script>

package/layout/_plugins/comments/artalk/script.ejs

@@ -2,8 +2,15 @@
   volantis.layoutHelper("comments",`<div id="artalk_container"><i class="fa-solid fa-cog fa-spin fa-fw fa-2x"></i></div>`);
   function load_artalk() {
     if(!document.querySelectorAll("#artalk_container")[0])return;
-    volantis.css("<%- theme.comments.artalk.css %>");
-    volantis.js("<%- theme.comments.artalk.js %>").then(pjax_artalk);
+    volantis.css("<%- theme.cdn.artalk_css %>");
+    <% if (theme.comments.artalk.latex) { %>
+    volantis.css("<%- theme.cdn.katex_css %>");
+    volantis.js("<%- theme.cdn.katex_js %>");
+    volantis.js("<%- theme.cdn.artalk_js %>");
+    volantis.js("<%- theme.cdn.artalk_katex %>").then(pjax_artalk);
+    <% } else { %>
+    volantis.js("<%- theme.cdn.artalk_js %>").then(pjax_artalk);
+    <% } %>
   }
 
   function pjax_artalk() {

package/layout/_plugins/comments/discuss/script.ejs

@@ -2,7 +2,7 @@
   volantis.layoutHelper("comments",`<div id="discuss_container"></div>`)
   function load_discuss() {
     if(!document.querySelectorAll("#discuss_container")[0])return;
-    volantis.js("<%- theme.comments.discuss.js %>", pjax_discuss)
+    volantis.js("<%- theme.cdn.discuss %>", pjax_discuss)
   }
   function pjax_discuss() {
     if(!document.querySelectorAll("#discuss_container")[0])return;

package/layout/_plugins/comments/disqusjs/script.ejs

@@ -2,8 +2,8 @@
   volantis.layoutHelper("comments",`<div id="disqus_thread"></div>`)
   // from: https://github.com/ChrAlpha/hexo-theme-cards/blob/master/layout/_plugins/comments/disqusjs/source.ejs
   function loadDisqusJS() {
-    volantis.js('<%= theme.comments.disqusjs.js %>', pjax_DisqusJS)
-    volantis.css('<%= theme.comments.disqusjs.css %>')
+    volantis.js('<%= theme.cdn.disqusjs_js %>', pjax_DisqusJS)
+    volantis.css('<%= theme.cdn.disqusjs_css %>')
   }
   let path = pdata.commentPath;
   if (path.length == 0) {

package/layout/_plugins/comments/gitalk/script.ejs

@@ -19,6 +19,6 @@
       gitalk.render('gitalk-container');
     }
   }
-  volantis.js('<%= theme.comments.gitalk.js %>').then(pjax_gitalk)
+  volantis.js('<%= theme.cdn.gitalk %>').then(pjax_gitalk)
   volantis.pjax.push(pjax_gitalk);
 </script>

package/layout/_plugins/comments/twikoo/script.ejs

@@ -2,7 +2,7 @@
   volantis.layoutHelper("comments",`<div id="twikoo_container"><i class="fa-solid fa-cog fa-spin fa-fw fa-2x"></i></div>`)
   function load_twikoo() {
     if(!document.querySelectorAll("#twikoo_container")[0])return;
-    volantis.js("<%- theme.comments.twikoo.js %>", pjax_twikoo)
+    volantis.js("<%- theme.cdn.twikoo %>", pjax_twikoo)
   }
   function pjax_twikoo() {
     if(!document.querySelectorAll("#twikoo_container")[0])return;

package/layout/_plugins/comments/vssue/script.ejs

@@ -1,8 +1,8 @@
 
-<script src="<%- theme.comments.vssue.vue %>"></script>
-<script src="<%- theme.comments.vssue.js %>"></script>
+<script src="<%- theme.cdn.vssue_vue %>"></script>
+<script src="<%- theme.cdn.vssue_js %>"></script>
 <script>
-  volantis.css("<%- theme.comments.vssue.css %>");
+  volantis.css("<%- theme.cdn.vssue_css %>");
   function fancybox_vssue() {
     if(typeof VolantisFancyBox === "undefined") {
       const checkFancyBox = setInterval(() => {

package/layout/_plugins/comments/waline/script.ejs

@@ -56,7 +56,7 @@
     }
   }
 
-  volantis.css('<%= theme.comments.waline.css %>')
-  volantis.js('<%- theme.comments.waline.js %>').then(pjax_waline)
+  volantis.css('<%= theme.cdn.waline_css %>')
+  volantis.js('<%- theme.cdn.waline_js %>').then(pjax_waline)
   volantis.pjax.push(pjax_waline);
 </script>

package/layout/_plugins/github-api/script.ejs

@@ -3,19 +3,19 @@
     <% if (theme.plugins.sitesjs.enable) { %>
       const sites_api = document.getElementById('sites-api');
       if (sites_api != undefined && typeof SitesJS === 'undefined') {
-        volantis.js("<%- theme.cdn.map.js.sites %>")
+        volantis.js("<%- theme.cdn.volantis_tags_sites %>")
       }
     <% } %>
     <% if (theme.plugins.friendsjs.enable) { %>
       const friends_api = document.getElementById('friends-api');
       if (friends_api != undefined && typeof FriendsJS === 'undefined') {
-        volantis.js("<%- theme.cdn.map.js.friends %>")
+        volantis.js("<%- theme.cdn.volantis_tags_friends %>")
       }
     <% } %>
     <% if (theme.plugins.contributorsjs.enable) { %>
       const contributors_api = document.getElementById('contributors-api');
       if (contributors_api != undefined && typeof ContributorsJS === 'undefined') {
-        volantis.js("<%- theme.cdn.map.js.contributors %>")
+        volantis.js("<%- theme.cdn.volantis_tags_contributors %>")
       }
     <% } %>
   };

package/layout/_plugins/lazyload/script.ejs

@@ -1,4 +1,4 @@
-<script defer src="<%- theme.plugins.lazyload.js %>"></script>
+<script defer src="<%- theme.cdn['vanilla-lazyload'] %>"></script>
 <script>
   // https://www.npmjs.com/package/vanilla-lazyload
   // Set the options globally

package/layout/_plugins/nodewaves/script.ejs

@@ -1,4 +1,4 @@
-<%- js({src: theme.plugins.nodewaves.js}) %>
+<%- js({src: theme.cdn.nodewaves_js}) %>
 <script type="text/javascript">
 document.addEventListener("DOMContentLoaded", function () {
   Waves.attach('.flat-btn', ['waves-button']);

package/layout/_plugins/pace/script.ejs

@@ -0,0 +1,15 @@
+<script>
+  volantis.css("<%- theme.cdn.pace_css %>");
+  volantis.js("<%- theme.cdn.pace_js %>").then(() => {
+    Pace.options.restartOnPushState = false;
+    volantis.pjax.send(Pace.restart);
+    // 阅读进度
+    volantis.scroll.push(() => {
+      Pace.stop();
+      Pace.trigger('start');
+      Pace.bar.update(volantis.scroll.progress() * 100);
+      document.body.className = document.body.className.replaceAll("pace-running ","");
+    },"阅读进度")
+    // todo：配置项开关, 哪些页面添加阅读进度
+  })
+</script>

package/layout/_plugins/parallax/script.ejs

@@ -63,7 +63,7 @@ _%>
   var runningOnBrowser = typeof window !== "undefined";
   var isBot = runningOnBrowser && !("onscroll" in window) || typeof navigator !== "undefined" && /(gle|ing|ro|msn)bot|crawl|spider|yand|duckgo/i.test(navigator.userAgent);
   if (!isBot) {
-    volantis.js('<%- theme.cdn.map.js.parallax %>').then(()=>{
+    volantis.js('<%- theme.cdn.volantis_parallax %>').then(()=>{
       parallax()
     })
     volantis.pjax.send(()=>{

package/layout/_plugins/pjax/index.ejs

@@ -6,18 +6,47 @@
   4.  .pjax
 -->
 <%
-  var banUrl = theme.plugins.pjax.banUrl || [];
+  var excludeList = theme.plugins.pjax.exclude || [];
 %>
 
-<%- js(theme.plugins.pjax.js) %>
-<% if (theme.plugins.pjax.animation){ %>
-<%- partial('animate') %>
-<% } %>
+<%- js(theme.cdn.pjax) %>
 <script>
+// 性能监控与降级控制
+const performanceMonitor = {
+  slowThreshold: 800,     // 慢请求阈值(毫秒)
+  slowCount: 0,           // 连续慢请求计数
+  maxSlowAllowed: 2,      // 允许的最大连续慢请求数
+  requestStartTime: 0,    // 请求开始时间戳
+
+  // 记录请求开始时间
+  start() {
+    this.requestStartTime = Date.now();
+  },
+
+  // 计算请求耗时并判断
+  check() {
+    const duration = Date.now() - this.requestStartTime;
+    
+    if (duration > this.slowThreshold) {
+      this.slowCount++;
+    } else {
+      this.slowCount = 0;    // 耗时正常，重置计数
+    }
+  },
+  // 测试结果
+  res(){
+    // 连续慢请求达到阈值，强制刷新
+    if (this.slowCount >= this.maxSlowAllowed) {         
+      return true;    // 需要降级
+    }
+    return false;     // 无需降级
+  }
+};
     var pjax;
     document.addEventListener('DOMContentLoaded', function () {
       pjax = new Pjax({
         elements: 'a[href]:not([href^="#"]):not([href="javascript:void(0)"]):not([pjax-fancybox]):not([onclick="return false;"]):not([onclick="return!1"]):not([target="_blank"]):not([target="view_window"]):not([href$=".xml"])',
+        // 这里的 selectors 需要保证每个页面都含有相同的数目
         selectors: [
           "head title",
           "head meta[name=keywords]",
@@ -27,7 +56,14 @@
           "#pjax-header-nav-list",
           ".pjax",
           "pjax", // <pjax></pjax> 标签
-          "script[data-pjax], .pjax-reload script" // script标签添加data-pjax 或 script标签外层添加.pjax-reload 的script代码段重载
+          // 临时测试
+          "meta[name=robots]",
+          "link[rel=canonical]",
+          "meta[property='og:title']",
+          "meta[property='og:description']",
+          "meta[property='og:url']",
+          "meta[property='og:image']",
+          "script[type='application/ld+json']",
         ],
         cacheBust: <%= theme.plugins.pjax.cacheBust %>,   // url 地址追加时间戳，用以避免浏览器缓存
         timeout: <%= theme.plugins.pjax.timeout %>,
@@ -36,19 +72,23 @@
     });
 
     document.addEventListener('pjax:send', function (e) {
-      //window.stop(); // 相当于点击了浏览器的停止按钮
+      window.stop(); // 相当于点击了浏览器的停止按钮
+      performanceMonitor.start();  // 请求开始计时
 
       try {
         var currentUrl = window.location.pathname;
         var targetUrl = e.triggerElement.href;
-        var banUrl = <%- '["' + banUrl.join('", "') + '"]' %>;
-        if (banUrl[0] != "") {
-          banUrl.forEach(item => {
+        var excludeList = <%- '["' + excludeList.join('", "') + '"]' %>;
+        if (excludeList[0] != "") {
+          excludeList.forEach(item => {
             if(currentUrl.indexOf(item) != -1 || targetUrl.indexOf(item) != -1) {
               window.location.href = targetUrl;
             }
           });
         }
+        if (performanceMonitor.res()){
+          window.location.href = targetUrl;
+        }
       } catch (error) {}
 
       // 使用 volantis.pjax.send 方法传入pjax:send回调函数 参见layout/_partial/scripts/global.ejs
@@ -56,12 +96,27 @@
     });
 
     document.addEventListener('pjax:complete', function () {
+      // 降级控制检测
+      performanceMonitor.check()
+      // 这里的 script 不需要保证每个页面都含有相同的数目
+      document.querySelectorAll('script[data-pjax], .pjax-reload script').forEach(e=>{
+        const code = e.text || e.textContent || e.innerHTML || '';
+        const script = document.createElement('script');
+        Object.keys(e.attributes).forEach(i=>{
+          script.setAttribute(e.attributes[i].nodeName,e.attributes[i].nodeValue)
+        })
+        if (code) {
+          script.appendChild(document.createTextNode(code));
+        }
+        e.parentNode.replaceChild(script, e);
+      });
+
       // 使用 volantis.pjax.push 方法传入重载函数 参见layout/_partial/scripts/global.ejs
       volantis.pjax.method.complete.start();
     });
 
     document.addEventListener('pjax:error', function (e) {
-      if(volantis.debug) {
+      if(volantis.debug === "pjax") {
         console.error(e);
         console.log('pjax error: \n' + JSON.stringify(e));
       }else{

package/layout/_plugins/pjax/pdata.ejs

@@ -34,11 +34,11 @@ if (page && page.layout == 'post' && page.title) {
   pdata.commentPath="<%=commentPath%>";
   pdata.commentPlaceholder="<%=commentPlaceholder%>";
   pdata.commentConfig=<%- JSON.stringify(commentConfig) %>;
-  //  see: /layout/_partial/scripts/_ctrl/coverCtrl.ejs
+  //  see: /layout/_partial/scripts/_ctrl.ejs
   <% if (theme.plugins.pjax.enable) {%>
     // header
     var l_header=document.getElementById("l_header");
-    <% if (theme.pjax_cover.frontMatterCover == "none") {%>
+    <% if (theme.cover_ctrl.frontMatterCover == "none") {%>
     l_header.classList.add("show");
     <% } else {%>
     l_header.classList.remove("show");
@@ -47,9 +47,9 @@ if (page && page.layout == 'post' && page.title) {
       // cover
       var cover_wrapper=document.querySelector('#l_cover .cover-wrapper');
       var scroll_down=document.getElementById('scroll-down');
-      cover_wrapper.id="<%=theme.pjax_cover.frontMatterCover%>";
-      cover_wrapper.style.display="<%=theme.pjax_cover.coverWrapperDisplay%>";
-      scroll_down.style.display="<%=theme.pjax_cover.scrollDownDisplay%>";
+      cover_wrapper.id="<%=theme.cover_ctrl.frontMatterCover%>";
+      cover_wrapper.style.display="<%=theme.cover_ctrl.coverWrapperDisplay%>";
+      scroll_down.style.display="<%=theme.cover_ctrl.scrollDownDisplay%>";
     <% }%>
   <% }%>
 </script>

package/layout/_plugins/preload/script.ejs

@@ -1,6 +1,6 @@
 <% let preload = theme.plugins.preload; %>
 <% if (preload.service == 'instant_page') { %>
-<script async src="<%- preload.instant_page %>" type="module" defer integrity="sha384-OeDn4XE77tdHo8pGtE1apMPmAipjoxUQ++eeJa6EtJCfHlvijigWiJpD7VDPWXV1"></script>
+<script async src="<%- theme.cdn.instant_page %>" type="module" defer integrity="sha384-OeDn4XE77tdHo8pGtE1apMPmAipjoxUQ++eeJa6EtJCfHlvijigWiJpD7VDPWXV1"></script>
 <% } else if (preload.service == 'flying_pages') { %>
 <script>
   window.FPConfig = {
@@ -10,5 +10,5 @@
 	hoverDelay: 0
   };
 </script>
-<script defer src="<%- preload.flying_pages %>"></script>
+<script defer src="<%- theme.cdn['flying-pages'] %>"></script>
 <% } %>

package/layout/_plugins/rightmenus/layout.ejs

@@ -100,13 +100,13 @@
     <p class='nav music-title fix-cursor-default'></p>
   </li>
   <li class='music ctrl'>
-    <a class='nav icon-only backward fix-cursor-default' href="/" onclick="return false;" title="backward">
+    <a class='nav icon-only backward fix-cursor-default'  title="backward">
       <i class='<%= theme.rightmenus.options.iconPrefix %> fa-step-backward fa-fw'></i>
     </a>
-    <a class='nav icon-only toggle fix-cursor-default' href="/" onclick="return false;" title="toggle">
+    <a class='nav icon-only toggle fix-cursor-default'  title="toggle">
       <i class='<%= theme.rightmenus.options.iconPrefix %> fa-play fa-fw'></i>
     </a>
-    <a class='nav icon-only forward fix-cursor-default' href="/" onclick="return false;" title="forward">
+    <a class='nav icon-only forward fix-cursor-default'  title="forward">
       <i class='<%= theme.rightmenus.options.iconPrefix %> fa-step-forward fa-fw'></i>
     </a>
   </li>
@@ -130,7 +130,7 @@
     <% rightMenu.initMenu() %>
   </ul>
 </div>
-<script src="<%- theme.cdn.map.js.rightMenus %>"></script>
+<script src="<%- theme.cdn.volantis_rightMenus %>"></script>
 <script>
   const RightMenusFunction = {};
   <% rightMenu.initFunction() %>

package/layout/_plugins/scrollreveal/script.ejs

@@ -15,8 +15,8 @@
       pjax_scrollrebeal();
     }
   }
-  volantis.js("<%- theme.plugins.scrollreveal.js %>");
-  document.addEventListener("DOMContentLoaded", init_scrollrebeal);
+  volantis.js("<%- theme.cdn.scrollreveal %>");
+  document.addEventListener("DOMContentLoaded", init_scrollrebeal)
   volantis.pjax.push(
     pjax_scrollrebeal,
     "pjax_scrollrebeal",

package/layout/_plugins/search/script.ejs

@@ -1,12 +1,15 @@
 <script>
-  const SearchServiceDataPathRoot = ("<%- config.root %>" || "/").endsWith("/") ?
-    "<%- config.root %>" || "/" :
-    "<%- config.root %>/" || "/";
-  const SearchServiceDataPath = SearchServiceDataPathRoot + "content.json";
-
-  function loadSearchScript() {
-    // see: layout/_partial/scripts/_ctrl/cdnCtrl.ejs
-    return volantis.js("<%- theme.cdn.map.js.search %>");
+  async function loadSearchScript() {
+    <% if(theme.search.service === 'algolia') { %>
+      await volantis.js("<%- theme.cdn.algolia_search_v4 %>")
+      await volantis.js("<%- theme.cdn.instantsearch_v4 %>")
+    <% } %>
+        
+    <% if(theme.search.service === 'meilisearch') { %>
+      await volantis.js("<%- theme.cdn.instantsearch_v4 %>")
+      await volantis.js("<%- theme.cdn.instant_meilisearch %>")
+    <% } %>
+    return volantis.js("<%- theme.cdn['volantis_search_' + theme.search.service] %>");
   }
 
   function loadSearchService() {

package/layout/_plugins/swiper/script.ejs

@@ -1,8 +1,8 @@
 <script>
   function load_swiper() {
     if (!document.querySelectorAll(".swiper-container")[0]) return;
-    volantis.css("<%- theme.plugins.swiper.css %>");
-    volantis.js("<%- theme.plugins.swiper.js %>").then(() => {
+    volantis.css("<%- theme.cdn.swiper_css %>");
+    volantis.js("<%- theme.cdn.swiper_js %>").then(() => {
       pjax_swiper();
     });
   }