hexo-theme-volantis 5.7.2 → 5.7.5

package/CHANGELOG.md

@@ -1,5 +1,30 @@
 # Changelog
 
+## [5.7.5](https://github.com/volantis-x/hexo-theme-volantis/compare/v5.7.4...v5.7.5) (2022-08-25)
+
+
+### Bug Fixes
+
+* **pandown:** Uncaught TypeError: pandown is not a function ([371b1ec](https://github.com/volantis-x/hexo-theme-volantis/commit/371b1ece729a719f102854d3175ce440f90b4a14))
+* search ([7f11915](https://github.com/volantis-x/hexo-theme-volantis/commit/7f11915c4c672f427a6044e2614ed85e7e052587))
+
+## [5.7.4](https://github.com/volantis-x/hexo-theme-volantis/compare/v5.7.3...v5.7.4) (2022-08-15)
+
+
+### Bug Fixes
+
+* **#793:** 修复空值 ([302c98f](https://github.com/volantis-x/hexo-theme-volantis/commit/302c98fc5b0c725fb77c6bb33d7537f8f1f2062f))
+
+## [5.7.3](https://github.com/volantis-x/hexo-theme-volantis/compare/v5.7.2...v5.7.3) (2022-08-15)
+
+
+### Bug Fixes
+
+* **#781:** content_visibility: false ([0c719be](https://github.com/volantis-x/hexo-theme-volantis/commit/0c719be17e8affb28dd42c9c8bfb52e3e21d9790))
+* **#793:** cdn_version: false ([cf60678](https://github.com/volantis-x/hexo-theme-volantis/commit/cf6067860312fbd6afd4ba6c14867d9ef86832fd))
+* **#793:** 移除默认配置 ([4d82dff](https://github.com/volantis-x/hexo-theme-volantis/commit/4d82dff4d41c513cfa0124cbed7e42b60236d9de))
+* **#798:** footer version link 404 ([a2a2d90](https://github.com/volantis-x/hexo-theme-volantis/commit/a2a2d90dc96fd00bb14cd742e0f05d253ef4ebed))
+
 ## [5.7.2](https://github.com/volantis-x/hexo-theme-volantis/compare/v5.7.1...v5.7.2) (2022-08-01)
 
 

package/_config.yml

@@ -50,17 +50,21 @@ cdn:
   # 以下配置可以覆盖 cdn.prefix,配置项的值可以为空，但是要使用CDN必须依据路径填写配置项的键
   set:
     js:
-      app: /js/app.js
+      #app: /js/app.js
     css:
-      style: /css/style.css # (异步加载样式)
+      #style: /css/style.css # (异步加载样式)
 # 静态资源版本控制
 # 本地文件使用文件内容的hash值作为版本号(app.8c1e7c88.js)  其他为时间戳 (?time=1648684470140)
 # 建议静态资源设置标头 浏览器缓存一年边缘缓存一个月 cache-control: max-age=86400, s-maxage=31536000 如果有更新记得刷新缓存
-cdn_version: true
+cdn_version: false
 # volantis static 静态资源文件 npm 包 CDN 地址 (后面加 "/" )
 # https://github.com/volantis-x/volantis-static
 volantis_static_cdn: https://unpkg.com/volantis-static@0.0.1654736714924/
 ########################################################################
+#  https://web.dev/content-visibility/
+#  https://www.caniuse.com/?search=content-visibility
+content_visibility: false
+
 # 全局页面字符串替换  A => B (可用于临时修改错字等)
 replace:
   - https://cdn.jsdelivr.net/npm/ => https://unpkg.com/
@@ -733,7 +737,7 @@ plugins:
 
   # https://scrollrevealjs.org/api/reveal.html
   scrollreveal:
-    enable: true
+    enable: #true
     js: volantis-static/libs/scrollreveal/dist/scrollreveal.min.js # https://unpkg.com/scrollreveal@4.0.9/dist/scrollreveal.min.js
     distance: 32px
     duration: 800 # ms

package/layout/_partial/footer.ejs

@@ -5,10 +5,14 @@
       layout = config.theme_config.footer.layout;
     }
     let theme_version = theme.info.theme_version
-    // 未发布的 alpha 版本
-    if (theme_version.indexOf("alpha")!=-1) {
-      theme_version = "dev"
-    }
+    // // 未发布的 alpha 版本
+    // if (theme_version.indexOf("alpha")!=-1) {
+    //   theme_version = "dev"
+    // }
+    // // 从 5.7.2 以后的版本以 v开头（release-please的奇怪设定）
+    // else if (theme_version.indexOf("beta")==-1||theme_version.indexOf("rc")==-1) {
+    //   theme_version = "v" + theme_version
+    // }
   %>
   <footer class="footer clearfix"  itemscope itemtype="http://schema.org/WPFooter">
     <br><br>
@@ -39,13 +43,13 @@
         <div><%- markdown(__('footer.license')) %></div>
       <% } else if (item == 'info') { %>
         <%- __('footer.use') %>
-        <a href="https://github.com/volantis-x/hexo-theme-volantis/tree/<%- theme_version %>" target="_blank" class="codename">Volantis</a>
+        <a href="https://github.com/volantis-x/hexo-theme-volantis/#<%- theme_version %>" target="_blank" class="codename">Volantis</a>
         <%- __('footer.theme') %><% if (theme.analytics.busuanzi) { %><%- __('symbol.comma') %><%- __('footer.total_views') %>
           <span id="busuanzi_value_site_pv"><i class="fa-solid fa-loader fa-spin fa-fw" aria-hidden="true"></i></span>
           <%- __('footer.times') %>
         <% } %>
       <% } else if (item == 'source') { %>
-        <%- markdown(__('footer.site_source', '[Volantis](https://github.com/volantis-x/hexo-theme-volantis/tree/'+theme_version+')', 'GitHub', 'https://github.com/volantis-x/volantis-docs')) %>
+        <%- markdown(__('footer.site_source', '[Volantis](https://github.com/volantis-x/hexo-theme-volantis/#'+theme_version+')', 'GitHub', 'https://github.com/volantis-x/volantis-docs')) %>
       <% } else if (item == 'copyright') { %>
         <div class='copyright'>
         <%- markdown(theme.site_footer.copyright) %>

package/layout/_partial/head.ejs

@@ -1,4 +1,4 @@
-<head hexo-theme='https://github.com/volantis-x/hexo-theme-volantis/tree/<%- theme.info.theme_version %>'>
+<head hexo-theme='https://github.com/volantis-x/hexo-theme-volantis/#<%- theme.info.theme_version %>'>
   <%- meta_generator() %>
   <meta name="Volantis" content="<%- theme.info.theme_version %>">
   <meta charset="utf-8">

package/layout/_partial/scripts/_ctrl/cdnCtrl.ejs

@@ -65,7 +65,7 @@
       const element = n[key];
       if(element && typeof element !="string"){
         dfs(element,path.concat(key))
-      }else{
+      }else if(element){
         let op=path.concat(key)
         let source=""
         for (let index = 1; index < op.length; index++) {
@@ -122,5 +122,6 @@
   //  ?time=' + Date.now() 替换为 theme.getStartTime 保证相同资源 hash 不变
   //  更新：
   //  本地文件使用文件内容的hash值作为版本号 app.8c1e7c88.js see: /scripts/helpers/revisioned.js
+  
   dfs(theme.cdn.set,[])
 _%>

package/layout/_partial/scripts/index.ejs

@@ -136,7 +136,9 @@
 
 <%- partial('toc') %>
 
-<%- partial('content-visibility-scroll-fix') %>
+<% if (theme.content_visibility) { %>
+  <%- partial('content-visibility-scroll-fix') %>
+<% } %>
 
 <%- partial('../../_plugins/slow-network/script') %>
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hexo-theme-volantis",
-  "version": "5.7.2",
+  "version": "5.7.5",
   "description": "Elegant and powerful theme for Hexo.",
   "main": "package.json",
   "scripts": {

package/scripts/filters/content-visibility.js

@@ -2,24 +2,26 @@
 // https://www.caniuse.com/?search=content-visibility
 // 在文章内容渲染时将每两个 <h2> 之间的内容分为一块 用 <div class="post-story"></div> 包裹起来。然后为 .post-story 声明 content-visibility: auto
 hexo.extend.filter.register('after_post_render', function (data) {
-  let dataList = data.content.split('\n')
-  let mydata = ``
-  let flag = 1
-  dataList.forEach(e => {
-    let yy = e.replace(/<h2.*?>.*?<\/h2>/, function (str) {
-      if (flag) {
-        flag = 0
-        return `<div class="story post-story">` + str
-      } else {
-        return `</div><div class="story post-story">` + str
-      }
-    })
-    mydata += yy
-    mydata += "\n"
-  });
-  if (!flag) {
-    mydata += `</div>`
+  if (this.theme.config.content_visibility) {
+    let dataList = data.content.split('\n')
+    let mydata = ``
+    let flag = 1
+    dataList.forEach(e => {
+      let yy = e.replace(/<h2.*?>.*?<\/h2>/, function (str) {
+        if (flag) {
+          flag = 0
+          return `<div class="story post-story">` + str
+        } else {
+          return `</div><div class="story post-story">` + str
+        }
+      })
+      mydata += yy
+      mydata += "\n"
+    });
+    if (!flag) {
+      mydata += `</div>`
+    }
+    data.content = mydata
   }
-  data.content = mydata
   return data;
 });

package/scripts/helpers/revisioned.js

@@ -62,7 +62,7 @@ const getRevisionedFilePath = (filePath, revision) => {
 
 const revisioned = (filePath) => {
   if (!hexo.theme.config.cdn_version) {
-    return;
+    return filePath;
   }
   let arg = process.argv[2];
   if (arg == "s" || arg == "server") {
@@ -160,7 +160,7 @@ const replaceRevisionPlaceholder = async () => {
       })
     );
   } catch (error) {
-    
+    hexo.log.error("cdn_version ERROR: " + error);
   }
 };
 

package/scripts/tags/pandown.js

@@ -24,10 +24,10 @@ hexo.extend.tag.register('pandown', function(args) {
     }
     let result = '';
     // js
-    result += '<div class="tag pandown-tags"><script type="text/javascript" src="https://unpkg.com/pandown"></script>';
+    result += '<div class="tag pandown-tags">';
     //pandown
     result += '<pandown type="'+type+'" url="'+url+'" pwd="'+pwd+'" fname="'+fname+'"></pandown>'
     //调用
-    result += '<script>pandown()</script></div>'
+    result += '<script>volantis.js("https://unpkg.com/pandown").then(pandown)</script></div>'
     return result;
 });

package/source/css/first.styl

@@ -1,17 +1,19 @@
 #safearea {
   display: none
 }
-// https://web.dev/content-visibility/
-// https://www.caniuse.com/?search=content-visibility
-/*
-  * Workaround for Chrome bug, part 1
-  * Chunk rendering for all but the first article.
-  * /layout/_partial/scripts/content-visibility-scroll-fix.ejs
-*/
-.post-story + .post-story{
-  content-visibility: auto;
-  contain-intrinsic-size: 10px 500px;
-}
+
+if hexo-config('content_visibility')
+  // https://web.dev/content-visibility/
+  // https://www.caniuse.com/?search=content-visibility
+  /*
+    * Workaround for Chrome bug, part 1
+    * Chunk rendering for all but the first article.
+    * /layout/_partial/scripts/content-visibility-scroll-fix.ejs
+  */
+  .post-story + .post-story{
+    content-visibility: auto;
+    contain-intrinsic-size: 10px 500px;
+  }
 
 @import '_defines/*'
 

package/source/js/search/hexo.js

@@ -1,5 +1,5 @@
 let SearchService = (() => {
-  fn = {};
+  const fn = {};
   fn.queryText = null;
   fn.data = null;
   fn.template = `<div id="u-search">
@@ -58,8 +58,8 @@ let SearchService = (() => {
       fn.data = await fn.fetchData();
     }
     let results = "";
-    results += fn.buildResultList(data.pages);
-    results += fn.buildResultList(data.posts);
+    results += fn.buildResultList(fn.data.pages);
+    results += fn.buildResultList(fn.data.posts);
     document.querySelector("#u-search .modal-results").innerHTML = results;
     window.pjax && pjax.refresh(document.querySelector("#u-search"));
     document.addEventListener("keydown", function f(event) {
@@ -76,7 +76,7 @@ let SearchService = (() => {
     return fetch(SearchServiceDataPath)
       .then((response) => response.text())
       .then((res) => {
-        data = JSON.parse(res);
+        const data = JSON.parse(res);
         // console.log(data);
         return data;
       });
@@ -87,8 +87,8 @@ let SearchService = (() => {
       if (post.text) {
         post.text = post.text.replace(/12345\d*/g, "") // 简易移除代码行号
       }
-      if (!post.title&&post.text) {
-        post.title = post.text.trim().slice(0,15)
+      if (!post.title && post.text) {
+        post.title = post.text.trim().slice(0, 15)
       }
       if (fn.contentSearch(post)) {
         html += fn.buildResult(post.permalink, post.title, post.digest);