hexo-theme-volantis 5.0.0-rc.8 → 5.0.0-rc.9

package/README.md

@@ -9,10 +9,10 @@
 Check your environment:
 
 ```yaml
-Hexo: 4.2 ~ 5.x
-hexo-cli: 3.1 ~ 4.x
-node.js: 12.16 LTS ~ latest LTS
-npm: 6.13 ~ latest LTS
+Hexo: 5.4 ~ 6.x
+hexo-cli: 4.x
+node.js: 16.x LTS ~ latest LTS
+npm: 8.x ~ latest LTS
 ```
 
 Edit your `_config.yml`:

package/_config.yml

@@ -1,7 +1,7 @@
 ############################### Volantis ###############################
 info:
   theme_name: Volantis # This is theme's name.
-  theme_version: '5.0.0-rc.8' # This is theme's version.
+  theme_version: '5.0.0-rc.9' # This is theme's version.
   theme_docs: https://volantis.js.org/ # This is theme's URL.
   theme_repo: https://github.com/volantis-x/hexo-theme-volantis
 # Debug 调试模式
@@ -1043,7 +1043,7 @@ color_scheme:
     # 主题色
     theme: '#3dd9b6'
     # 链接色
-    link: '#1b79c4'
+    link: '#2092ec'
     # 按钮色
     button: '#44D7B6'
     # 鼠标放到交互元素上时的色
@@ -1100,11 +1100,11 @@ color_scheme:
     # 卡片背景色              # Dark Grey 3
     card: '#262626'
     # 网站背景上的文字
-    site_inner: '#eee'
+    site_inner: '#eeeeeede'
     # 网站页脚文字
-    site_footer: '#aaa'
+    site_footer: '#aaaaaade'
     # 卡片上的普通文字
-    text: '#eee'
+    text: '#eeeeeede'
 
     # 区块和代码块背景色       # Dark Grey 4
     block: '#434343'
@@ -1113,21 +1113,21 @@ color_scheme:
     # 行内代码颜色
     inlinecode: '#D56D28'
 
-    # 文章部分
-    h1: '#f5f5f5'            #  Dark Grey 8
-    h2: '#f5f5f5'
-    h3: '#f0f0f0'            #  Dark Grey 7
-    h4: '#f0f0f0'
-    h5: '#f0f0f0'
-    h6: '#f0f0f0'
-    p: '#d9d9d9e6'           #  Dark Grey 6
+    # 文章部分 高强度文本的不透明度应为87％ 中等重点文字适用于60％
+    h1: '#FFFFFFde'            #  Dark Grey 8
+    h2: '#FFFFFFde'
+    h3: '#FFFFFF99'            #  Dark Grey 7
+    h4: '#FFFFFF99'
+    h5: '#FFFFFF99'
+    h6: '#FFFFFF99'
+    p: '#d9d9d9de'           #  Dark Grey 6
 
     # 列表文字                #  Dark Grey 6
-    list: '#d9d9d9d9'
+    list: '#d9d9d9de'
     # 列表 hover 时的文字
     list_hl: 'mix($color-theme, #fff, 80)'
     # 辅助性文字              #  Dark Grey 5
-    meta: '#bfbfbf'
+    meta: '#bfbfbfde'
     # 夜间图片亮度
     brightness: 70%
 ############################### Color Scheme ############################### > end

package/package.json

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

package/scripts/events/index.js

@@ -7,6 +7,7 @@ hexo.on('generateBefore', () => {
   require('./lib/config')(hexo);
   require('./lib/stellar-tag-utils')(hexo);
   require('./lib/render-stylus')(hexo);
+  require('./lib/check-environment')(hexo);
 });
 
 hexo.on('ready', () => {

package/scripts/events/lib/check-environment.js

@@ -0,0 +1,55 @@
+'use strict';
+const exec = require('child_process').exec;
+module.exports =(hexo) => {
+  if (!hexo.checkEnvironment) {
+    hexo.checkEnvironment=1;
+    hexo.log.info(`Checking environment configuration...`);
+    exec('node -v', (err, stdout, stderr) => {
+      if (err) {
+        CheckError(hexo,`node.js: ${err}`);
+      }
+      let nodeVersion = stdout.match(/v(\d*)/)[1];
+      if (nodeVersion<14) {
+        hexo.log.info(`node.js 版本：${stdout}`);
+        CheckError(hexo,`node.js 版本过低，请升级至 v14.x 以上版本！`);
+      }else{
+        exec('hexo -v', (err, stdout, stderr) => {
+          if (err) {
+            CheckError(hexo,`hexo-cli: ${err}`);
+          }
+          let hexoVersion1 = stdout.match(/hexo:\s*(\d*)/)[1];
+          let hexoVersion2 = stdout.match(/hexo:\s*\d*\.(\d*)/)[1];
+          if (hexoVersion1<5 || (hexoVersion1==5 && hexoVersion2<4)) {
+            hexo.log.info(`hexo  版本：${stdout}`);
+            CheckError(hexo,`hexo 版本过低，请升级至 5.4 以上版本！`);
+          }else{
+            let hexoClVersion1 = stdout.match(/hexo-cli:\s*(\d*)/)[1];
+            let hexoClVersion2 = stdout.match(/hexo-cli:\s*\d*\.(\d*)/)[1];
+            if (hexoClVersion1<4 || (hexoClVersion1==4 && hexoClVersion2<1)) {
+              hexo.log.info(`hexo-cli 版本：${stdout}`);
+              CheckError(hexo,`hexo-cli 版本过低，请升级至 4.1 以上版本！`);
+            }else{
+              hexo.log.info(`Check environment configuration success!`);
+            }
+          }
+        });
+      }
+    });
+  }
+};
+
+function CheckError(hexo,msg) {
+  hexo.log.error(`
+============================================================
+环境配置检查失败！| Environment configuration check failed!
+============================================================
+${msg}
+============================================================
+推荐的配置：
+Hexo: 5.4 ~ 6.x
+hexo-cli: 4.3 ~ latest
+node.js: 16.x LTS ~ latest LTS
+npm: 8.x ~ latest LTS
+============================================================`);
+  throw new Error('环境配置检查失败！| Environment configuration check failed!');
+}

package/scripts/tags/note.js

@@ -48,4 +48,27 @@ function postNoteBlock(args, content) {
 }
 
 hexo.extend.tag.register('note', postNote);
-hexo.extend.tag.register('noteblock', postNoteBlock, {ends: true});
+
+// https://github.com/volantis-x/hexo-theme-volantis/issues/712
+// {% blocknote style, title %}
+// content
+// {% endblocknote %}
+hexo.extend.tag.register('blocknote', postNoteBlock, {ends: true});
+// 兼容 noteblock
+hexo.extend.filter.register('before_post_render', function(data) {
+  data.content = data.content.replace(/{%\s+noteblock(.*)%}/g, (p,q)=>{
+    return `{% blocknote ${q} %}`
+  });
+  data.content = data.content.replace(/{%\s+endnoteblock\s+%}/g, '{% endblocknote %}');
+  return data;
+});
+// 兼容 noteblock 失败
+hexo.extend.tag.register('noteblock', postNoteBlockDeprecated, {ends: true});
+function postNoteBlockDeprecated(args, content) {
+    throw new Error(`
+==================================================================================
+        {% noteblock %} is deprecated. Use {% blocknote %} instead.
+        see: https://github.com/volantis-x/hexo-theme-volantis/issues/712
+==================================================================================
+  `);
+}