hexo-component-inferno 3.1.2 → 4.1.0

package/asset/js/algolia.js

@@ -8,7 +8,7 @@ function loadAlgolia(config, translation) {
 
   search.addWidgets([
     instantsearch.widgets.configure({
-      attributesToSnippet: ['excerpt'],
+      attributesToSnippet: [config.excerpt],
     }),
   ]);
 
@@ -47,7 +47,7 @@ function loadAlgolia(config, translation) {
         },
         item: function (hit) {
           let title = instantsearch.highlight({ attribute: 'title', hit });
-          let excerpt = instantsearch.highlight({ attribute: 'excerpt', hit });
+          let excerpt = instantsearch.highlight({ attribute: config.excerpt, hit });
           title = title ? title : translation.untitled;
           excerpt = excerpt
             .replace(new RegExp('<em>', 'ig'), '[algolia-highlight]')
@@ -88,15 +88,56 @@ function loadAlgolia(config, translation) {
     $('.searchbox').addClass('show');
   }
 
+  const $main = $('.searchbox');
+  let opener = null;
+
+  function open() {
+    if (!$main.hasClass('show')) {
+      opener = document.activeElement;
+      $main.addClass('show');
+    }
+    $main.find('.searchbox-input').focus();
+  }
+
+  // Return the focus to the element that opened the search box, unless it moved elsewhere
+  function close(restoreFocus = true) {
+    $main.removeClass('show');
+    if (restoreFocus && opener && document.contains(opener)) {
+      opener.focus();
+    }
+    opener = null;
+  }
+
+  // Open the search box with "/" (unless typing in a field) or Ctrl/Cmd+K
+  function isSearchShortcut(e) {
+    if (e.altKey) {
+      return false;
+    }
+    if (e.ctrlKey || e.metaKey) {
+      return !e.shiftKey && typeof e.key === 'string' && e.key.toLowerCase() === 'k';
+    }
+    // e.key is "/" whatever keys type it on the keyboard layout, so do not check e.shiftKey
+    const target = e.target;
+    const typing = target.isContentEditable || /^(input|textarea|select)$/i.test(target.tagName);
+    return e.key === '/' && !typing;
+  }
+
   $(document)
-    .on('click', '.navbar-main .search', () => {
-      $('.searchbox').toggleClass('show');
-      $('.searchbox-input').focus();
-    })
-    .on('click', '.searchbox .searchbox-mask', () => {
-      $('.searchbox').removeClass('show');
+    .on('click', '.navbar-main .search', open)
+    .on('click', '.searchbox .searchbox-mask', () => close())
+    .on('click', '.searchbox-close', () => close())
+    .on('focusin', (e) => {
+      // Close the search box when the focus moves to the rest of the page, e.g., by Tab
+      if ($main.hasClass('show') && !$main[0].contains(e.target)) {
+        close(false);
+      }
     })
-    .on('click', '.searchbox-close', () => {
-      $('.searchbox').removeClass('show');
+    .on('keydown', (e) => {
+      if (isSearchShortcut(e)) {
+        e.preventDefault();
+        open();
+      } else if (e.keyCode === 27 && $main.hasClass('show')) {
+        close();
+      }
     });
 }

package/asset/js/google_cse.js

@@ -16,15 +16,58 @@
     };
   }
 
+  let opener = null;
+
+  function open() {
+    const $main = $('.searchbox');
+    if (!$main.hasClass('show')) {
+      opener = document.activeElement;
+      $main.addClass('show');
+    }
+    $main.find('.searchbox-input').focus();
+  }
+
+  // Return the focus to the element that opened the search box, unless it moved elsewhere
+  function close(restoreFocus = true) {
+    $('.searchbox').removeClass('show');
+    if (restoreFocus && opener && document.contains(opener)) {
+      opener.focus();
+    }
+    opener = null;
+  }
+
+  // Open the search box with "/" (unless typing in a field) or Ctrl/Cmd+K
+  function isSearchShortcut(e) {
+    if (e.altKey) {
+      return false;
+    }
+    if (e.ctrlKey || e.metaKey) {
+      return !e.shiftKey && typeof e.key === 'string' && e.key.toLowerCase() === 'k';
+    }
+    // e.key is "/" whatever keys type it on the keyboard layout, so do not check e.shiftKey
+    const target = e.target;
+    const typing = target.isContentEditable || /^(input|textarea|select)$/i.test(target.tagName);
+    return e.key === '/' && !typing;
+  }
+
   $(document)
-    .on('click', '.navbar-main .search', () => {
-      $('.searchbox').toggleClass('show');
-    })
-    .on('click', '.searchbox .searchbox-mask', () => {
-      $('.searchbox').removeClass('show');
+    .on('click', '.navbar-main .search', open)
+    .on('click', '.searchbox .searchbox-mask', () => close())
+    .on('click', '.searchbox-close', () => close())
+    .on('focusin', (e) => {
+      // Close the search box when the focus moves to the rest of the page, e.g., by Tab
+      const main = $('.searchbox')[0];
+      if (main && $(main).hasClass('show') && !main.contains(e.target)) {
+        close(false);
+      }
     })
-    .on('click', '.searchbox-close', () => {
-      $('.searchbox').removeClass('show');
+    .on('keydown', (e) => {
+      if (isSearchShortcut(e)) {
+        e.preventDefault();
+        open();
+      } else if (e.keyCode === 27 && $('.searchbox').hasClass('show')) {
+        close();
+      }
     })
     .on(
       'keydown',

package/asset/js/insight.js

@@ -87,7 +87,7 @@ function loadInsight(config, translation) {
 
     return `<a class="searchbox-result-item" href="${url}">
             <span class="searchbox-result-icon">
-                <i class="fa fa-${icon}" />
+                <i class="fa fa-${icon}"></i>
             </span>
             <span class="searchbox-result-content">
                 <span class="searchbox-result-title">
@@ -287,6 +287,39 @@ function loadInsight(config, translation) {
     scrollTo($($items[nextPosition]));
   }
 
+  let opener = null;
+
+  function open() {
+    if (!$main.hasClass('show')) {
+      opener = document.activeElement;
+      $main.addClass('show');
+    }
+    $input.focus();
+  }
+
+  // Return the focus to the element that opened the search box, unless it moved elsewhere
+  function close(restoreFocus = true) {
+    $main.removeClass('show');
+    if (restoreFocus && opener && document.contains(opener)) {
+      opener.focus();
+    }
+    opener = null;
+  }
+
+  // Open the search box with "/" (unless typing in a field) or Ctrl/Cmd+K
+  function isSearchShortcut(e) {
+    if (e.altKey) {
+      return false;
+    }
+    if (e.ctrlKey || e.metaKey) {
+      return !e.shiftKey && typeof e.key === 'string' && e.key.toLowerCase() === 'k';
+    }
+    // e.key is "/" whatever keys type it on the keyboard layout, so do not check e.shiftKey
+    const target = e.target;
+    const typing = target.isContentEditable || /^(input|textarea|select)$/i.test(target.tagName);
+    return e.key === '/' && !typing;
+  }
+
   function gotoLink($item) {
     if ($item && $item.length) {
       location.href = $item.attr('href');
@@ -306,10 +339,7 @@ function loadInsight(config, translation) {
 
   let touch = false;
   $(document)
-    .on('click focus', '.navbar-main .search', () => {
-      $main.addClass('show');
-      $main.find('.searchbox-input').focus();
-    })
+    .on('click', '.navbar-main .search', open)
     .on('click touchend', '.searchbox-result-item', function (e) {
       if (e.type !== 'click' && !touch) {
         return;
@@ -325,14 +355,25 @@ function loadInsight(config, translation) {
       setTimeout(() => {
         $('.navbar-main').css('pointer-events', 'auto');
       }, 400);
-      $main.removeClass('show');
+      close();
       touch = false;
     })
+    .on('focusin', (e) => {
+      // Close the search box when the focus moves to the rest of the page, e.g., by Tab
+      if ($main.hasClass('show') && !$main[0].contains(e.target)) {
+        close(false);
+      }
+    })
     .on('keydown', (e) => {
+      if (isSearchShortcut(e)) {
+        e.preventDefault();
+        open();
+        return;
+      }
       if (!$main.hasClass('show')) return;
       switch (e.keyCode) {
         case 27: // ESC
-          $main.removeClass('show');
+          close();
           break;
         case 38: // UP
           selectItemByDiff(-1);

package/lib/hexo/filter/locals.js

@@ -36,8 +36,8 @@ const yaml = require('js-yaml');
  */
 module.exports = hexo => {
   const RESERVED_KEYS = {
-    post: Object.keys(require('hexo/dist/models/post')(hexo).paths),
-    page: Object.keys(require('hexo/dist/models/page')(hexo).paths)
+    post: Object.keys(hexo.model('Post').schema.paths),
+    page: Object.keys(hexo.model('Page').schema.paths)
   };
   function loadLayoutConfig(layout) {
     let config = {};

package/lib/hexo/helper/cdn.js

@@ -59,6 +59,11 @@ const UNPKG_FIXTURES = {
  * cdn('jquery', '3.3.1', 'dist/jquery.min.js');
  * // -> https://cdn.jsdelivr.net/npm/jquery@3.3.1/dist/jquery.min.js
  *
+ * // Set providers.cdn_overrides, e.g., { jquery: 'unpkg' }, to use a different CDN provider or URL
+ * // template for some packages
+ * cdn('jquery', '3.3.1', 'dist/jquery.min.js');
+ * // -> https://unpkg.com/jquery@3.3.1/dist/jquery.min.js
+ *
  * // Use the function below to resolve the CDN URL web font files
  * fontcdn('Ubuntu:400,600|Source+Code+Pro', 'css');
  * // -> https://fonts.googleapis.com/css?family=Ubuntu:400,600|Source+Code+Pro
@@ -80,9 +85,12 @@ module.exports = function (hexo) {
     return [_package, version, filename];
   }
   hexo.extend.helper.register('cdn', function (_package, version, filename) {
+    const providers = typeof this.config.providers === 'object' ? this.config.providers : {};
     const {
-      cdn = 'jsdelivr'
-    } = typeof this.config.providers === 'object' ? this.config.providers : {};
+      cdn_overrides: overrides
+    } = providers;
+    // A package can use a different provider or URL than the rest in providers.cdn_overrides
+    const cdn = typeof overrides === 'object' && overrides !== null && overrides[_package] ? overrides[_package] : providers.cdn || 'jsdelivr';
     let _cdn = cdn;
     if (_cdn in PROVIDERS.LIBRARY) {
       _cdn = PROVIDERS.LIBRARY[_cdn];

package/lib/schema/comment/artalk.json

@@ -0,0 +1,37 @@
+{
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "$id": "/comment/artalk.json",
+  "description": "Artalk comment plugin configurations\nhttps://artalk.js.org/guide/frontend/config.html",
+  "type": "object",
+  "properties": {
+    "type": {
+      "type": "string",
+      "const": "artalk"
+    },
+    "server": {
+      "type": "string",
+      "description": "URL of your Artalk server"
+    },
+    "site": {
+      "type": "string",
+      "description": "Name of the site on the Artalk server",
+      "nullable": true
+    },
+    "page_key": {
+      "type": "string",
+      "description": "Unique identifier of the page. Uses the path of the page if not set",
+      "nullable": true
+    },
+    "locale": {
+      "type": "string",
+      "description": "Language of Artalk, e.g., en, zh-CN, or auto",
+      "nullable": true
+    },
+    "dark_mode": {
+      "type": ["boolean", "string"],
+      "description": "Dark mode: true, false, or 'auto' to follow the system color scheme. Follows the appearance of the theme (the data-appearance attribute of <html>) if not set",
+      "nullable": true
+    }
+  },
+  "required": ["type", "server"]
+}

package/lib/schema/comment/beaudar.json

@@ -0,0 +1,62 @@
+{
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "$id": "/comment/beaudar.json",
+  "description": "Beaudar comment plugin configurations\nhttps://github.com/beaudar/beaudar",
+  "type": "object",
+  "properties": {
+    "type": {
+      "type": "string",
+      "const": "beaudar"
+    },
+    "repo": {
+      "type": "string",
+      "description": "Name of the GitHub repository for the comments, e.g., user/repo"
+    },
+    "branch": {
+      "type": "string",
+      "description": "Branch of the repository that has beaudar.json",
+      "nullable": true
+    },
+    "label": {
+      "type": "string",
+      "description": "Label of the issues created by Beaudar",
+      "nullable": true
+    },
+    "theme": {
+      "type": "string",
+      "description": "Beaudar look and feel when the page looks light, e.g., github-light, github-dark, or preferred-color-scheme",
+      "default": "github-light",
+      "nullable": true
+    },
+    "dark_theme": {
+      "type": "string",
+      "description": "Beaudar look and feel when the page looks dark, e.g., with the dark or auto appearance of the theme. For example github-dark, github-dark-orange, classic-dark, dark-blue, icy-dark, or photon-dark",
+      "default": "github-dark",
+      "nullable": true
+    }
+  },
+  "required": ["type", "repo"],
+  "oneOf": [
+    {
+      "type": "object",
+      "properties": {
+        "issue_term": {
+          "type": "string",
+          "description": "The mapping between blog posts and GitHub issues, e.g., pathname, url, or title",
+          "default": "pathname"
+        }
+      },
+      "required": ["issue_term"]
+    },
+    {
+      "type": "object",
+      "properties": {
+        "issue_number": {
+          "type": "integer",
+          "description": "Configure Beaudar to load a specific issue by number"
+        }
+      },
+      "required": ["issue_number"]
+    }
+  ]
+}

package/lib/schema/comment/cusdis.json

@@ -0,0 +1,34 @@
+{
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "$id": "/comment/cusdis.json",
+  "description": "Cusdis comment plugin configurations\nhttps://cusdis.com/doc",
+  "type": "object",
+  "properties": {
+    "type": {
+      "type": "string",
+      "const": "cusdis"
+    },
+    "app_id": {
+      "type": "string",
+      "description": "App ID of the website in the embed code from the Cusdis dashboard"
+    },
+    "host": {
+      "type": "string",
+      "description": "URL of your Cusdis server if you host it yourself",
+      "default": "https://cusdis.com",
+      "nullable": true
+    },
+    "theme": {
+      "type": "string",
+      "description": "Theme of Cusdis: light, dark, or auto to follow the system color scheme. Follows the appearance of the theme (the data-appearance attribute of <html>) if not set",
+      "enum": ["light", "dark", "auto"],
+      "nullable": true
+    },
+    "lang": {
+      "type": "string",
+      "description": "Language of Cusdis, e.g., zh-cn, zh-tw, es, or fi. Uses English if not set",
+      "nullable": true
+    }
+  },
+  "required": ["type", "app_id"]
+}

package/lib/schema/comment/giscus.json

@@ -60,7 +60,7 @@
     },
     "theme": {
       "type": "string",
-      "description": "Giscus look and feel",
+      "description": "Giscus look and feel when the page looks light",
       "enum": [
         "light",
         "light_high_contrast",
@@ -83,6 +83,12 @@
       "default": "noborder_light",
       "nullable": true
     },
+    "darkTheme": {
+      "type": "string",
+      "description": "Giscus look and feel when the page looks dark, e.g., with the dark or auto appearance of the theme. Not used when theme is custom",
+      "default": "noborder_dark",
+      "nullable": true
+    },
     "customThemeCss": {
       "type": "string",
       "description": "The url of custom Giscus theme css, only affect when theme is set to custom",

package/lib/schema/comment/utterances.json

@@ -19,7 +19,7 @@
     },
     "theme": {
       "type": "string",
-      "description": "Utterances look and feel",
+      "description": "Utterances look and feel when the page looks light",
       "enum": [
         "github-light",
         "github-dark",
@@ -30,6 +30,20 @@
       ],
       "default": "github-light",
       "nullable": true
+    },
+    "dark_theme": {
+      "type": "string",
+      "description": "Utterances look and feel when the page looks dark, e.g., with the dark or auto appearance of the theme",
+      "enum": [
+        "github-light",
+        "github-dark",
+        "github-dark-orange",
+        "icy-dark",
+        "dark-blue",
+        "photon-dark"
+      ],
+      "default": "github-dark",
+      "nullable": true
     }
   },
   "required": ["type", "repo"],

package/lib/schema/comment/valine.json

@@ -1,7 +1,7 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
   "$id": "/comment/valine.json",
-  "description": "Valine comment plugin configurations",
+  "description": "Valine comment plugin configurations\nWARNING: Valine saves comments, including the commenters' email addresses, in a LeanCloud class that anyone with your public app ID and key can read. Consider Waline or another comment system instead.",
   "type": "object",
   "properties": {
     "type": {
@@ -69,7 +69,7 @@
     },
     "record_ip": {
       "type": "boolean",
-      "description": "Record reviewer IP address",
+      "description": "Record reviewer IP address. The IP addresses can be read by anyone, like the email addresses",
       "default": false,
       "nullable": true
     },

package/lib/schema/comment/waline.json

@@ -77,7 +77,7 @@
     },
     "dark": {
       "type": ["string", "boolean"],
-      "description": "Darkmode support.",
+      "description": "Darkmode support. Can be true, false, 'auto' to follow the system color scheme, or a CSS selector that enables the dark mode when it matches an ancestor of Waline. Follows the appearance of the theme (the data-appearance attribute of <html>) if not set",
       "nullable": true
     },
     "meta": {

package/lib/schema/plugin/matomo.json

@@ -0,0 +1,25 @@
+{
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "$id": "/plugin/matomo.json",
+  "description": "Matomo analytics plugin settings\nhttps://matomo.org",
+  "type": "object",
+  "properties": {
+    "url": {
+      "type": "string",
+      "description": "URL of your Matomo server, e.g., https://matomo.example.com/ or https://example.matomo.cloud/",
+      "nullable": true
+    },
+    "site_id": {
+      "type": ["string", "number"],
+      "description": "Matomo site ID",
+      "nullable": true
+    },
+    "disable_cookies": {
+      "type": "boolean",
+      "description": "Track visitors without setting cookies",
+      "default": false,
+      "nullable": true
+    }
+  },
+  "required": ["url", "site_id"]
+}

package/lib/schema/plugin/umami.json

@@ -0,0 +1,25 @@
+{
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "$id": "/plugin/umami.json",
+  "description": "Umami analytics plugin settings\nhttps://umami.is/docs/tracker-configuration",
+  "type": "object",
+  "properties": {
+    "website_id": {
+      "type": "string",
+      "description": "Umami website ID",
+      "nullable": true
+    },
+    "script_url": {
+      "type": "string",
+      "description": "URL of the Umami tracker script. Change it to the one on your server if you host Umami yourself",
+      "default": "https://cloud.umami.is/script.js",
+      "nullable": true
+    },
+    "domains": {
+      "type": "string",
+      "description": "Only track the visits on these comma-separated domains",
+      "nullable": true
+    }
+  },
+  "required": ["website_id"]
+}

package/lib/schema/plugin/waline_pageview.json

@@ -0,0 +1,14 @@
+{
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "$id": "/plugin/waline_pageview.json",
+  "description": "Waline page view counter, true to use the server of the Waline comments, which can also store the views in LeanCloud. Do not also enable the pageview option of the Waline comments, which would count the views twice\nhttps://waline.js.org/en/guide/features/pageview.html",
+  "type": ["boolean", "object"],
+  "properties": {
+    "server_url": {
+      "type": "string",
+      "description": "URL of the Waline server. Uses the server of the Waline comments if not set",
+      "nullable": true
+    }
+  },
+  "default": false
+}

package/lib/schema/search/algolia.json

@@ -7,6 +7,10 @@
     "type": {
       "type": "string",
       "const": "algolia"
+    },
+    "excerpt": {
+      "type": "string",
+      "description": "The field name to be used as the excerpt in the Algolia index. Defaults to 'excerpt'."
     }
   },
   "required": ["type"]

package/lib/schema/widget/archives.json

@@ -7,6 +7,11 @@
     "type": {
       "type": "string",
       "const": "archives"
+    },
+    "amount": {
+      "type": "integer",
+      "description": "Amount of archives to show, with a link to the archive page for the rest. Will show all if not set",
+      "nullable": true
     }
   },
   "required": ["type"]

package/lib/schema/widget/categories.json

@@ -7,6 +7,11 @@
     "type": {
       "type": "string",
       "const": "categories"
+    },
+    "amount": {
+      "type": "integer",
+      "description": "Amount of top-level categories to show, with a link to the category page for the rest. Will show all if not set",
+      "nullable": true
     }
   },
   "required": ["type"]

package/lib/schema/widget/tags.json

@@ -16,7 +16,7 @@
     },
     "amount": {
       "type": "integer",
-      "description": "Amount of tags to show. Will show all if not set.",
+      "description": "Amount of tags to show, with a link to the tag page for the rest. Will show all if not set.",
       "nullable": true
     },
     "show_count": {

package/lib/util/appearance.js

@@ -0,0 +1,40 @@
+/**
+ * Utility functions for inline scripts that follow the appearance of the page.
+ * @module util/appearance
+ */
+
+/**
+ * Get a JavaScript expression that is true when the page looks dark.
+ * <p>
+ * A theme can set the appearance of a page with the <code>data-appearance</code> attribute of
+ * <code>&lt;html&gt;</code>: <code>dark</code> always looks dark, <code>auto</code> looks dark when
+ * the system prefers a dark color scheme, and any other value, or no attribute, looks light.
+ *
+ * @returns {string} The JavaScript expression.
+ *
+ * @example
+ * const js = `var theme = ${isDark()} ? 'dark' : 'light';`;
+ */
+function isDark() {
+  return `(function (appearance) {
+    return appearance === 'dark' || (appearance === 'auto' && !!window.matchMedia &&
+      window.matchMedia('(prefers-color-scheme: dark)').matches);
+  })(document.documentElement.getAttribute('data-appearance'))`;
+}
+
+/**
+ * Get a JavaScript expression for the appearance of the page: <code>'dark'</code>,
+ * <code>'auto'</code>, or <code>'light'</code>.
+ *
+ * @returns {string} The JavaScript expression.
+ * @see module:util/appearance.isDark
+ */
+function getAppearance() {
+  return `(function (appearance) {
+    return appearance === 'dark' || appearance === 'auto' ? appearance : 'light';
+  })(document.documentElement.getAttribute('data-appearance'))`;
+}
+module.exports = {
+  isDark,
+  getAppearance
+};