npm - hexo-theme-volantis - Versions diffs - 4.3.0 → 5.0.0-rc.2 - Mend

hexo-theme-volantis 4.3.0 → 5.0.0-rc.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (853) hide show

package/layout/friends.ejs CHANGED Viewed

@@ -1,5 +1,5 @@
 <%- partial('_pre') %>
-<div class='l_main<%- page.sidebar == false ? ' no_sidebar' : '' %>'>
+<div id="l_main" class='<%- page.sidebar == false ? ' no_sidebar' : '' %>'>
   <article id="<%= page.layout %>" class="md post article article-entry l_friends white-box reveal <%- theme.custom_css.body.effect.join(' ') %> article-type-<%= page.layout %>" itemscope itemprop="blogPost">
     <%- partial('_partial/meta',{post: page, position: 'top'}) %>
     <%- page.excerpt %>
@@ -13,31 +13,12 @@
           <% if (group.description) { %>
             <%- markdown(group.description) %>
           <%} %>
-          <% if (theme.pages.friends.layout_scheme == 'sites') { %>
-            <div class='site-card-group'>
-              <% (group.items||[]).forEach(function(item){ %>
-                <% if (item.url && item.title) { %>
-                  <a class="site-card" target="_blank" rel="external nofollow noopener noreferrer" href="<%- url_for(item.url || '/') %>">
-                    <div class="img">
-                      <% if (item.screenshot) { %>
-                        <img src="<%- item.screenshot %>"/>
-                      <% } %>
-                    </div>
-                    <div class="info">
-                      <img src="<%- item.avatar || (theme.plugins.lazyload && theme.plugins.lazyload.loadingImg) %>"/>
-                      <span class="title"><%- item.title %></span>
-                      <span class="desc"><%- item.description %></span>
-                    </div>
-                  </a>
-                <% } %>
-              <% }) %>
-            </div>
-          <% } else if (theme.pages.friends.layout_scheme == 'traditional') { %>
+          <% if (theme.pages.friends.layout_scheme == 'traditional') { %>
             <div class='friend-content'>
               <% (group.items||[]).forEach(function(item){ %>
                 <% if (item.url && item.title) { %>
                   <a class='friend-card'
-                    target="_blank" rel="external nofollow noopener noreferrer" href='<%- url_for(item.url || '/') %>'>
+                    target="_blank" rel="external noopener noreferrer" href="<%- url_for(item.url || '/') %>">
                     <div class='friend-left'>
                       <% if (item.avatar) { %>
                         <img class='avatar' src='<%- item.avatar || (theme.plugins.lazyload && theme.plugins.lazyload.loadingImg) %>'/>
@@ -66,7 +47,7 @@
             <div class='simpleuser-group'>
               <% (group.items||[]).forEach(function(item){ %>
                 <% if (item.url && item.title) { %>
-                  <a class="simpleuser" target="_blank" rel="external nofollow noopener noreferrer" href="<%- url_for(item.url || '/') %>">
+                  <a class="simpleuser" target="_blank" rel="external noopener noreferrer" href="<%- url_for(item.url || '/') %>">
                     <img src="<%- item.avatar || (theme.plugins.lazyload && theme.plugins.lazyload.loadingImg) %>"/>
                     <span><%- item.title %></span>
                   </a>
@@ -82,7 +63,7 @@
     <%- partial('_partial/meta',{post: page, position: 'bottom'}) %>
   </article>
-  <%- partial('_third-party/comments/index') %>
+  <%- partial('_plugins/comments/index',{post: page}) %>
 </div>
 <%- partial('_partial/side') %>

package/layout/index.ejs CHANGED Viewed

@@ -1,5 +1,5 @@
 <%- partial('_pre') %>
-<div class='l_main<%- page.sidebar == false ? ' no_sidebar' : '' %>'>
+<div id="l_main" class='<%- page.sidebar == false ? ' no_sidebar' : '' %>'>
   <%- partial('_partial/archive') %>
 </div>
 <%- partial('_partial/side') %>

package/layout/layout.ejs CHANGED Viewed

@@ -1,27 +1,28 @@
 <!DOCTYPE html>
 <html lang="<%- config.language %>">
-  <%- partial('_partial/head') %>
-  <body>
+  <%- partial('_partial/scripts/_ctrl') _%>
+  <%- partial('_partial/head') _%>
+  <body itemscope itemtype="http://schema.org/WebPage">
     <%- partial('_partial/header', null, {cache: false, path: path}) %>
     <div id="l_body">
       <%- partial('_partial/cover') %>
       <div id="safearea">
-        <div class="body-wrapper" id="pjax-container">
+        <div class="body-wrapper">
           <%- body %>
-		  <% if (page.snackbar && site.data.notification && (page.snackbar in site.data.notification)) { %>
-		    <%- partial('_partial/snackbar') %>
-		  <% } %>
-		  <%- partial('_third-party/pjax/pdata') %>
+          <%- partial('_plugins/pjax/pdata') %>
         </div>
         <%- partial('_partial/footer', null, {cache: !config.relative_link}) %>
-        <a id="s-top" class="fas fa-arrow-up fa-fw" href="javascript:void(0)"></a>
+        <a id="s-top" class="fas fa-arrow-up fa-fw" href="/" onclick="return false;" title="top"></a>
       </div>
     </div>
     <div>
-      <%- partial('_partial/scripts/index') %>
-	  <% if (theme.plugins.pjax.enable){ %>
-	    <%- partial('_third-party/pjax/index') %>
-	  <% } %>
+      <%- partial('_partial/scripts/index') %>
+      <% if (theme.plugins.pjax.enable){ %>
+        <%- partial('_plugins/pjax/index') %>
+      <% } %>
     </div>
+  <!-- Custom Files bodyEnd begin-->
+  <%- volantis_inject('bodyEnd') %>
+  <!-- Custom Files bodyEnd end-->
   </body>
 </html>

package/layout/list.ejs CHANGED Viewed

@@ -1,6 +1,6 @@
 <%- partial('_pre') %>
 <% page.comments = false; %>
-<div class='l_main<%- page.sidebar == false ? ' no_sidebar' : '' %>'>
+<div id="l_main" class='<%- page.sidebar == false ? ' no_sidebar' : '' %>'>
   <% if (site.pages && site.pages.length > 0) { %>
     <section class="post-list">
       <% site.pages.sort("-date").each(function(post){ %>

package/layout/page.ejs CHANGED Viewed

@@ -1,5 +1,5 @@
 <%- partial('_pre') %>
-<div class='l_main<%- page.sidebar == false ? ' no_sidebar' : '' %>'>
+<div id="l_main" class='<%- page.sidebar == false ? ' no_sidebar' : '' %>'>
   <%- partial('_partial/article', {post: page, index: false}) %>
 </div>
 <%- partial('_partial/side') %>

package/layout/post.ejs CHANGED Viewed

@@ -1,5 +1,5 @@
 <%- partial('_pre') %>
-<div class='l_main<%- page.sidebar == false ? ' no_sidebar' : '' %>'>
+<div id="l_main" class='<%- page.sidebar == false ? ' no_sidebar' : '' %>'>
   <%- partial('_partial/article', {post: page, index: false}) %>
 </div>
 <%- partial('_partial/side') %>

package/layout/tag.ejs CHANGED Viewed

@@ -1,8 +1,13 @@
 <%- partial('_pre') %>
-<% page.comments = false; %>
-<div class='l_main<%- page.sidebar == false ? ' no_sidebar' : '' %>'>
+<%
+page.comments = false;
+if (!page.robots) {
+  page.robots = 'noindex,follow';
+}
+%>
+<div id="l_main" class='<%- page.sidebar == false ? ' no_sidebar' : '' %>'>
   <% if (site.posts && site.posts.length > 0) { %>
-    <% if (page.layout == 'tag') { %>
+    <% if ((page.layout == 'tag')||(page.layout == 'tags')) { %>
       <div class='post-wrapper'>
         <article id="tag" class="post article white-box reveal <%- theme.custom_css.body.effect.join(' ') %>">
           <h2><%- page.title %></h2>

package/package.json CHANGED Viewed

@@ -1,10 +1,9 @@
 {
   "name": "hexo-theme-volantis",
-  "version": "4.3.0",
+  "version": "5.0.0-rc.2",
   "description": "Elegant and powerful theme for Hexo.",
   "main": "package.json",
   "scripts": {
-    "eslint": "eslint scripts/ source/js --fix",
     "test": "echo test"
   },
   "repository": {
@@ -23,6 +22,8 @@
   },
   "homepage": "https://volantis.js.org",
   "devDependencies": {
-    "eslint": "^7.16.0"
+    "hexo": "^6.0.0",
+    "hexo-renderer-stylus": "^2.0.1",
+    "hexo-renderer-ejs": "^2.0.0"
   }
 }

package/scripts/events/index.js CHANGED Viewed

@@ -5,4 +5,16 @@
 hexo.on('generateBefore', () => {
   // Merge config.
   require('./lib/config')(hexo);
+  require('./lib/utils')(hexo);
+  require('./lib/renderStylus')(hexo);
+});
+hexo.on('ready', () => {
+  const { version } = require('../../package.json');
+  hexo.log.info(`
+============================================================
+  Volantis ${version}
+  Docs: https://volantis.js.org/
+  Repo: https://github.com/volantis-x/hexo-theme-volantis/
+============================================================`);
 });

package/scripts/events/lib/config.js CHANGED Viewed

@@ -15,6 +15,23 @@ function merge(target, source) {
   return target;
 }
+// hexo.config.root or hexo.theme.config.cdn.prefix + /media/ or /libs/
+function checkLibPrefix(source,hexo) {
+  for (const key in source) {
+    if (isObject(source[key])) {
+      checkLibPrefix(source[key],hexo);
+    } else if(source[key] && typeof source[key] =="string") {
+      if(source[key].match(/^\/media\//g)||source[key].match(/^\/libs\//g)){
+        if(hexo.theme.config.cdn.enable&&hexo.theme.config.cdn.prefix){
+          source[key] = hexo.theme.config.cdn.prefix + source[key]
+        }else if(hexo.config.root){
+          source[key] = hexo.config.root + source[key].slice(1)
+        }
+      }
+    }
+  }
+}
 module.exports = hexo => {
   if (!hexo.locals.get) return;
@@ -22,16 +39,17 @@ module.exports = hexo => {
   if (!data) return;
   /**
-   * Merge configs from _data/next.yml into hexo.theme.config.
-   * If `override`, configs in next.yml will rewrite configs in hexo.theme.config.
-   * If next.yml not exists, merge all `theme_config.*` into hexo.theme.config.
+   * Merge configs from _data/volantis.yml into hexo.theme.config.
+   * If `override`, configs in volantis.yml will rewrite configs in hexo.theme.config.
+   * If volantis.yml not exists, merge all `theme_config.*` into hexo.theme.config.
    */
-  if (data.next) {
-    if (data.next.override) {
-      hexo.theme.config = data.next;
+  if (data.volantis) {
+    if (data.volantis.override) {
+      hexo.theme.config = data.volantis;
     } else {
-      merge(hexo.config, data.next);
-      merge(hexo.theme.config, data.next);
+      merge(hexo.config, data.volantis);
+      merge(hexo.theme.config, data.volantis);
     }
   } else {
     merge(hexo.theme.config, hexo.config.theme_config);
@@ -60,4 +78,5 @@ module.exports = hexo => {
       mergeLang(language);
     }
   }
+  checkLibPrefix(hexo.theme.config,hexo)
 };

package/scripts/events/lib/renderStylus.js ADDED Viewed

@@ -0,0 +1,78 @@
+// hexo.renderStylus 渲染 Stylus 的工具函数
+// hexo.createUuid   创建 uuid
+const stylus = require("stylus");
+const Promise = require("bluebird");
+module.exports = hexo => {
+  hexo.renderStylus = async (str) => {
+    /**************************************************************************** */
+    // from https://github.com/hexojs/hexo-renderer-stylus/blob/8f63a5e1ad886466ce59532978dfa34b4b3c6dc7/lib/renderer.js#L5
+    function getProperty(obj, name) {
+      name = name.replace(/\[(\w+)\]/g, ".$1").replace(/^\./, "");
+      const split = name.split(".");
+      let key = split.shift();
+      if (!Object.prototype.hasOwnProperty.call(obj, key)) return "";
+      let result = obj[key];
+      const len = split.length;
+      if (!len) return result || "";
+      if (typeof result !== "object") return "";
+      for (let i = 0; i < len; i++) {
+        key = split[i];
+        if (!Object.prototype.hasOwnProperty.call(result, key)) return "";
+        result = result[split[i]];
+        if (typeof result !== "object") return result;
+      }
+      return result;
+    }
+    function defineConfig(style) {
+      style.define("hexo-config", (data) => {
+        return getProperty(hexo.theme.config, data.val);
+      });
+    }
+    /**************************************************************************** */
+    return new Promise((resolve) => {
+      return stylus(str)
+        .use(defineConfig)
+        .include(hexo.theme.context.theme_dir + "source/css/")
+        .render(function (err, css) {
+          if (err) throw err;
+          resolve(css);
+          return css;
+        });
+    })
+  }
+  hexo.createUuid = () => {
+    let s = [];
+    const hexDigits = '0123456789abcdef';
+    for (let i = 0; i < 36; i++) {
+      s[i] = hexDigits.substr(Math.floor(Math.random() * 0x10), 1);
+    }
+    s[19] = hexDigits.substr((s[19] & 0x3) | 0x8, 1);
+    s[8] = s[13] = s[18] = s[23] = '-';
+    return s.join('');
+  };
+  hexo.merge = merge;
+  hexo.getType = getType;
+};
+function isObject(item) {
+  return item && typeof item === 'object' && !Array.isArray(item);
+}
+function merge(target, source) {
+  for (const key in source) {
+    if (isObject(target[key]) && isObject(source[key])) {
+      merge(target[key], source[key]);
+    } else {
+      target[key] = source[key];
+    }
+  }
+  return target;
+}
+function getType(file){
+  var filename=file;
+  var index1=filename.lastIndexOf(".");
+  var index2=filename.length;
+  var type=filename.substring(index1+1,index2);
+  return type;
+}

package/scripts/events/lib/utils.js ADDED Viewed

@@ -0,0 +1,76 @@
+/**
+ * utils.js v1 | https://github.com/xaoxuu/hexo-theme-stellar/
+ */
+// stellar 标签插件 命令解析器
+'use strict';
+module.exports = hexo => {
+  hexo.args = {
+    map: (args, keys, others) => {
+      if (Array.isArray(args) == false) {
+        return args;
+      }
+      var map = {others: Array()};
+      args.forEach((arg, i) => {
+        let kv = arg.trim();
+        if (kv.includes('://') && kv.split(':').length == 2) {
+          // 纯 url
+          map.others.push(kv);
+        } else {
+          kv = kv.split(':');
+          if (kv.length > 1) {
+            if (keys.includes(kv[0]) == true) {
+              map[kv.shift()] = kv.join(':');
+            } else {
+              map.others.push(kv.join(':'));
+            }
+          } else if (kv.length == 1) {
+            map.others.push(kv[0]);
+          }
+        }
+      });
+      // 解析不带 key 的参数
+      if (others && others.length > 0 && map.others.length > 0) {
+        if (Array.isArray(others) == false) {
+          others = [others];
+        }
+        others.forEach((arg, i) => {
+          map[arg] = map.others.shift();
+        });
+        // 最后一段合并到最后一个参数中
+        if (map.others.length > 0) {
+          map[others[others.length-1]] += ' ' + map.others.join(' ');
+          map.others = [];
+        }
+      }
+      return map;
+    },
+    joinTags: (args, keys) => {
+      if (Array.isArray(keys) == false) {
+        keys = [keys];
+      }
+      var ret = [];
+      keys.forEach((key, i) => {
+        if (args[key] && args[key].length > 0) {
+          ret.push(key + '="' + args[key] + '"');
+        }
+      });
+      return ret;
+    },
+    joinURLParams: (args, keys) => {
+      if (Array.isArray(keys) == false) {
+        keys = [keys];
+      }
+      var ret = [];
+      keys.forEach((key, i) => {
+        if (args[key] && args[key].length > 0) {
+          ret.push(key + '=' + args[key]);
+        }
+      });
+      return ret.join('&');
+    }
+  };
+};

package/scripts/filters/content-visibility.js ADDED Viewed

@@ -0,0 +1,25 @@
+// https://web.dev/content-visibility/
+// 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 str + `<div class="story post-story">`
+      } else {
+        return `</div>` + str + `<div class="story post-story">`
+      }
+    })
+    mydata += yy
+    mydata += "\n"
+  });
+  if (!flag) {
+    mydata += `</div>`
+  }
+  data.content = mydata
+  return data;
+});

package/scripts/{render → filters}/img.js RENAMED Viewed

File without changes

package/scripts/filters/replace.js ADDED Viewed

@@ -0,0 +1,15 @@
+/* global hexo */
+'use strict';
+hexo.extend.filter.register('after_render:html', function(data) {
+  if (hexo.theme.config.replace) {
+    hexo.theme.config.replace.forEach(e => {
+      let s = e.split(" => ")
+      let a = s[0]
+      let b = s[1]
+      data = data.replace(new RegExp(a,"g"), b);
+    });
+  }
+  return data;
+},999999999999);

package/scripts/{z-lazyload → filters/z-lazyload}/index.js RENAMED Viewed

File without changes

package/scripts/{z-lazyload → filters/z-lazyload}/lib/process.js RENAMED Viewed

@@ -52,7 +52,7 @@ function lazyProcess(htmlContent, target) {
     if (loadingImg) {
       return result.replace(p2, p2 + '" class="lazyload placeholder" ' + 'data-srcset="' + p2 + '" srcset="' + loadingImg);
     }
-    return result.replace(p2, p2 + '" class="lazyload" ' + 'data-srcset="' + p2 + '" srcset="' + 'data:image/png;base64,666');
+    return result.replace(p2, p2 + '" class="lazyload" ' + 'data-srcset="' + p2 + '" srcset="' + 'data:image/gif;base64,R0lGODlhAQABAIAAAP///////yH5BAEKAAEALAAAAAABAAEAAAICTAEAOw==');
   });
 }

package/scripts/helpers/custom-files/index.js ADDED Viewed

@@ -0,0 +1,163 @@
+// Custom Files 自定义文件   --- Modified From NexT ---
+const fs = require('hexo-fs');
+const path = require('path');
+const defaultExtname = '.ejs';
+let points = {
+  styles: [
+    "first",
+    "style",
+    "dark",
+    "darkVar",
+  ],
+  views: [
+    "head",
+    "header",
+    "side",
+    "topMeta",
+    "bottomMeta",
+    "footer",
+    "postEnd",
+    "bodyEnd",
+  ]
+}
+// hexo s 和 hexo server 时监听自定义文件变动
+function watchFile(path) {
+  let arg = process.argv[2];
+  if (arg == "s" || arg == "server") {
+    fs.watch(path)
+  }
+}
+function isObject(item) {
+  return item && typeof item === 'object' && !Array.isArray(item);
+}
+function merge(target, source) {
+  for (const key in source) {
+    if (isObject(target[key]) && isObject(source[key])) {
+      merge(target[key], source[key]);
+    } else {
+      target[key] = source[key];
+    }
+  }
+  return target;
+}
+hexo.merge = merge;
+hexo.extend.filter.register('theme_inject', injects => {
+  let filePath = {}
+  points.styles.forEach(key => {
+    filePath[key] = "source/_volantis/" + key + ".styl"
+  });
+  points.views.forEach(key => {
+    filePath[key] = "source/_volantis/" + key + defaultExtname
+  });
+  filePath = hexo.merge(filePath, hexo.theme.config.custom_files)
+  // console.log(filePath);
+  // console.log(hexo.theme.config.custom_files);
+  points.styles.forEach(key => {
+    if (filePath[key]) {
+      injects[key].push(filePath[key]);
+    }
+  });
+  points.views.forEach(key => {
+    if (filePath[key]) {
+      injects[key].file('custom', filePath[key]);
+    }
+  });
+}, 99);
+hexo.extend.helper.register('volantis_inject', function (point) {
+  if (this.theme.injects[point]) {
+    return this.theme.injects[point]
+      .map(item => this.partial(item.layout, item.locals, item.options))
+      .join('');
+  }
+  return []
+});
+hexo.on('generateBefore', function () {
+  hexo.theme.config.custom = {};
+  // Defining stylus types
+  class StylusInject {
+    constructor(base_dir) {
+      this.base_dir = base_dir;
+      this.files = [];
+    }
+    push(file) {
+      // Get absolute path base on hexo dir
+      let temp_path = path.resolve(this.base_dir, file)
+      watchFile(temp_path)
+      if (fs.existsSync(temp_path)) {
+        this.files.push(temp_path);
+      }
+    }
+  }
+  // Defining view types
+  class ViewInject {
+    constructor(base_dir) {
+      this.base_dir = base_dir;
+      this.raws = [];
+    }
+    raw(name, raw, ...args) {
+      // Set default extname
+      if (path.extname(name) === '') {
+        name += defaultExtname;
+      }
+      this.raws.push({ name, raw, args });
+    }
+    file(name, file, ...args) {
+      // Set default extname from file's extname
+      if (path.extname(name) === '') {
+        name += path.extname(file);
+      }
+      // Get absolute path base on hexo dir
+      let temp_path = path.resolve(this.base_dir, file)
+      let temp_raw = ""
+      watchFile(temp_path)
+      if (fs.existsSync(temp_path)) {
+        temp_raw = fs.readFileSync(temp_path)
+      }
+      this.raw(name, temp_raw, ...args);
+    }
+  }
+  // Init injects
+  function initInject(base_dir) {
+    const injects = {};
+    points.styles.forEach(item => {
+      injects[item] = new StylusInject(base_dir);
+    });
+    points.views.forEach(item => {
+      injects[item] = new ViewInject(base_dir);
+    });
+    return injects;
+  }
+  hexo.theme.config.injects = {};
+  const injects = initInject(hexo.base_dir);
+  hexo.execFilterSync('theme_inject', injects);
+  points.styles.forEach(type => {
+    hexo.theme.config.injects[type] = injects[type].files;
+  });
+  // Inject views
+  points.views.forEach(type => {
+    const configs = Object.create(null);
+    hexo.theme.config.injects[type] = [];
+    // Add or override view.
+    injects[type].raws.forEach((injectObj, index) => {
+      const name = `inject/${type}/${injectObj.name}`;
+      hexo.theme.setView(name, injectObj.raw);
+      configs[name] = {
+        layout: name,
+        locals: injectObj.args[0],
+        options: injectObj.args[1],
+        order: injectObj.args[2] || index
+      };
+    });
+    // Views sort.
+    hexo.theme.config.injects[type] = Object.values(configs).sort((x, y) => x.order - y.order)
+    // console.log(injects);
+  });
+});

package/scripts/helpers/first-style/index.js ADDED Viewed

@@ -0,0 +1,19 @@
+// 将首屏样式 first.styl 硬编码到HTML页面
+"use strict";
+const fs = require("hexo-fs");
+function generateFirstCSS() {
+  let s = fs.readFileSync(
+    hexo.theme.context.theme_dir + "source/css/first.styl"
+  );
+  hexo.renderStylus(s).then((css)=>{
+    hexo.locals.set('FirstCSS', function(){
+      return css
+    });
+  })
+}
+function getFirstCSS() {
+  return hexo.locals.get('FirstCSS');
+}
+hexo.extend.filter.register("before_generate", generateFirstCSS);
+hexo.extend.helper.register("FirstCSS", getFirstCSS);

package/scripts/helpers/head/autoCanonical.js ADDED Viewed

@@ -0,0 +1,15 @@
+/**
+* hexo-auto-canonical
+* https://github.com/hyunseob/hexo-auto-canonical.git
+* Copyright (c) 2015, HyunSeob
+* Licensed under the MIT license.
+*/
+'use strict';
+hexo.extend.helper.register('autoCanonical', function (config, page) {
+  var base_url = config.url;
+  if (config.url.charAt(config.url.length - 1) !== '/') base_url += '/';
+  return '<link rel="canonical" href="' + base_url + page.canonical_path.replace('index.html', '').toLowerCase() + '"/>';
+});