hexo-component-inferno 4.1.0 → 4.2.0

package/lib/view/plugin/outdated_browser.js

@@ -53,7 +53,7 @@ var OutdatedBrowser = /*#__PURE__*/function (_Component) {
           "href": cssUrl
         });
       }
-      return (0, _inferno.createFragment)([(0, _inferno.createVNode)(1, "div", null, [(0, _inferno.createVNode)(1, "h6", null, "Your browser is out-of-date!", 16), (0, _inferno.createVNode)(1, "p", null, [(0, _inferno.createTextVNode)("Update your browser to view this website correctly.&npsb;"), (0, _inferno.createVNode)(1, "a", null, [(0, _inferno.createTextVNode)("Update my browser now"), (0, _inferno.createTextVNode)(' ')], 0, {
+      return (0, _inferno.createFragment)([(0, _inferno.createVNode)(1, "div", null, [(0, _inferno.createVNode)(1, "h6", null, "Your browser is out-of-date!", 16), (0, _inferno.createVNode)(1, "p", null, [(0, _inferno.createTextVNode)("Update your browser to view this website correctly.\xA0"), (0, _inferno.createVNode)(1, "a", null, [(0, _inferno.createTextVNode)("Update my browser now"), (0, _inferno.createTextVNode)(' ')], 0, {
         "id": "btnUpdateBrowser",
         "href": "http://outdatedbrowser.com/"
       })], 4), (0, _inferno.createVNode)(1, "p", "last", (0, _inferno.createVNode)(1, "a", null, "\xD7", 16, {

package/lib/view/plugin/statcounter.js

@@ -22,6 +22,8 @@ var _require = require('inferno'),
   Component = _require.Component;
 var _require2 = require('../../util/cache'),
   cacheComponent = _require2.cacheComponent;
+var _require3 = require('../../util/script'),
+  toJs = _require3.toJs;
 
 /**
  * Statcounter statistics plugin JSX component.
@@ -42,7 +44,7 @@ var Statcounter = /*#__PURE__*/function (_Component) {
       var _this$props = this.props,
         project = _this$props.project,
         security = _this$props.security;
-      var js = "\n      var sc_project=".concat(JSON.stringify(project), ";\n      var sc_invisible=1;\n      var sc_security=").concat(JSON.stringify(security), ";\n      var sc_https=1;\n      var sc_remove_link=1;");
+      var js = "\n      var sc_project=".concat(toJs(project), ";\n      var sc_invisible=1;\n      var sc_security=").concat(toJs(security), ";\n      var sc_https=1;\n      var sc_remove_link=1;");
       return (0, _inferno.createFragment)([(0, _inferno.createVNode)(1, "script", null, null, 1, {
         "dangerouslySetInnerHTML": {
           __html: js

package/lib/view/plugin/twitter_conversion_tracking.js

@@ -22,6 +22,8 @@ var _require = require('inferno'),
   Component = _require.Component;
 var _require2 = require('../../util/cache'),
   cacheComponent = _require2.cacheComponent;
+var _require3 = require('../../util/script'),
+  toJs = _require3.toJs;
 
 /**
  * Twitter conversion tracking plugin JSX component.
@@ -40,7 +42,7 @@ var TwiterCT = /*#__PURE__*/function (_Component) {
     key: "render",
     value: function render() {
       var pixelId = this.props.pixelId;
-      var js = "\n    !function(e,t,n,s,u,a){e.twq||(s=e.twq=function(){s.exe?s.exe.apply(s,arguments):s.queue.push(arguments);\n    },s.version='1.1',s.queue=[],u=t.createElement(n),u.async=!0,u.src='//static.ads-twitter.com/uwt.js',\n    a=t.getElementsByTagName(n)[0],a.parentNode.insertBefore(u,a))}(window,document,'script');\n    twq('init', ".concat(JSON.stringify(pixelId), ");\n    twq('track', 'PageView');\n    ");
+      var js = "\n    !function(e,t,n,s,u,a){e.twq||(s=e.twq=function(){s.exe?s.exe.apply(s,arguments):s.queue.push(arguments);\n    },s.version='1.1',s.queue=[],u=t.createElement(n),u.async=!0,u.src='//static.ads-twitter.com/uwt.js',\n    a=t.getElementsByTagName(n)[0],a.parentNode.insertBefore(u,a))}(window,document,'script');\n    twq('init', ".concat(toJs(pixelId), ");\n    twq('track', 'PageView');\n    ");
       return (0, _inferno.createVNode)(1, "script", null, null, 1, {
         "dangerouslySetInnerHTML": {
           __html: js

package/lib/view/plugin/waline_pageview.js

@@ -22,6 +22,8 @@ var _require = require('inferno'),
   Component = _require.Component;
 var _require2 = require('../../util/cache'),
   cacheComponent = _require2.cacheComponent;
+var _require3 = require('../../util/script'),
+  toJs = _require3.toJs;
 
 /**
  * Waline page view counter plugin JSX component.
@@ -50,7 +52,7 @@ var WalinePageview = /*#__PURE__*/function (_Component) {
         jsUrl = _this$props.jsUrl;
 
       // Waline publishes the counter as an ES module, so load it with a dynamic import
-      var js = "(function () {\n        var abort = null;\n        function count() {\n          import(".concat(JSON.stringify(jsUrl), ").then(function (Waline) {\n            if (abort) {\n              abort();\n            }\n            abort = Waline.pageviewCount({\n              serverURL: ").concat(JSON.stringify(serverURL), ",\n              path: window.location.pathname,\n            });\n          });\n        }\n        count();\n        document.addEventListener('pjax:complete', count);\n      })();");
+      var js = "(function () {\n        var abort = null;\n        function count() {\n          import(".concat(toJs(jsUrl), ").then(function (Waline) {\n            if (abort) {\n              abort();\n            }\n            abort = Waline.pageviewCount({\n              serverURL: ").concat(toJs(serverURL), ",\n              path: window.location.pathname,\n            });\n          });\n        }\n        count();\n        document.addEventListener('pjax:complete', count);\n      })();");
       return (0, _inferno.createVNode)(1, "script", null, null, 1, {
         "dangerouslySetInnerHTML": {
           __html: js

package/lib/view/search/algolia.js

@@ -22,6 +22,8 @@ var _require = require('inferno'),
   Component = _require.Component;
 var _require2 = require('../../util/cache'),
   cacheComponent = _require2.cacheComponent;
+var _require3 = require('../../util/script'),
+  toJs = _require3.toJs;
 
 /**
  * Algolia search engine JSX component.
@@ -69,7 +71,7 @@ var Algolia = /*#__PURE__*/function (_Component) {
         indexName: indexName,
         excerpt: excerpt
       };
-      var js = "document.addEventListener('DOMContentLoaded', function () {\n            loadAlgolia(".concat(JSON.stringify(config), ", ").concat(JSON.stringify(translation), ");\n        });");
+      var js = "document.addEventListener('DOMContentLoaded', function () {\n            loadAlgolia(".concat(toJs(config), ", ").concat(toJs(translation), ");\n        });");
       return (0, _inferno.createFragment)([(0, _inferno.createVNode)(1, "div", "searchbox", [(0, _inferno.createVNode)(1, "div", "searchbox-mask", null, 1, {
         "style": "position:absolute;bottom:0px;left:0px;right:0px;top:0px;"
       }), (0, _inferno.createVNode)(1, "div", "searchbox-container", [(0, _inferno.createVNode)(1, "div", "searchbox-header", [(0, _inferno.createVNode)(1, "div", "searchbox-input-container", null, 1, {

package/lib/view/search/baidu.js

@@ -22,6 +22,8 @@ var _require = require('inferno'),
   Component = _require.Component;
 var _require2 = require('../../util/cache'),
   cacheComponent = _require2.cacheComponent;
+var _require3 = require('../../util/script'),
+  toJs = _require3.toJs;
 
 /**
  * Baidu search engine JSX component.
@@ -42,7 +44,7 @@ var Baidu = /*#__PURE__*/function (_Component) {
         url = _this$props.url,
         hint = _this$props.hint;
       var siteUrl = url.replace(/http(s)*:\/\//, '');
-      var js = "(function ($) {\n            $('.searchbox-input-container').on('submit', function (e) {\n                var keyword = $('.searchbox-input[name=\"wd\"]').val();\n                window.location = 'https://www.baidu.com/s?wd=site:".concat(siteUrl, " ' + keyword;\n                return false;\n            });\n        })(jQuery);\n        (function (document, $) {\n            $(document).on('click', '.navbar-main .search', function () {\n                $('.searchbox').toggleClass('show');\n            }).on('click', '.searchbox .searchbox-mask', function () {\n                $('.searchbox').removeClass('show');\n            }).on('click', '.searchbox-close', function () {\n                $('.searchbox').removeClass('show');\n            });\n        })(document, jQuery);");
+      var js = "(function ($) {\n            $('.searchbox-input-container').on('submit', function (e) {\n                var keyword = $('.searchbox-input[name=\"wd\"]').val();\n                window.location = ".concat(toJs("https://www.baidu.com/s?wd=site:".concat(siteUrl, " ")), " + keyword;\n                return false;\n            });\n        })(jQuery);\n        (function (document, $) {\n            $(document).on('click', '.navbar-main .search', function () {\n                $('.searchbox').toggleClass('show');\n            }).on('click', '.searchbox .searchbox-mask', function () {\n                $('.searchbox').removeClass('show');\n            }).on('click', '.searchbox-close', function () {\n                $('.searchbox').removeClass('show');\n            });\n        })(document, jQuery);");
       return (0, _inferno.createFragment)([(0, _inferno.createVNode)(1, "div", "searchbox", [(0, _inferno.createVNode)(1, "div", "searchbox-mask", null, 1, {
         "style": "position:absolute;bottom:0px;left:0px;right:0px;top:0px;"
       }), (0, _inferno.createVNode)(1, "div", "searchbox-container", (0, _inferno.createVNode)(1, "div", "searchbox-header", [(0, _inferno.createVNode)(1, "form", "searchbox-input-container", (0, _inferno.createVNode)(64, "input", "searchbox-input", null, 1, {

package/lib/view/search/google_cse.js

@@ -22,6 +22,8 @@ var _require = require('inferno'),
   Component = _require.Component;
 var _require2 = require('../../util/cache'),
   cacheComponent = _require2.cacheComponent;
+var _require3 = require('../../util/script'),
+  toJs = _require3.toJs;
 
 /**
  * Google custom search engine JSX component.
@@ -47,7 +49,7 @@ var GoogleCSE = /*#__PURE__*/function (_Component) {
         hint = _this$props.hint,
         jsUrl = _this$props.jsUrl;
       var css = '.searchbox .searchbox-body { background: white; }';
-      var js1 = "(function() {\n            var cx = '".concat(cx, "';\n            var gcse = document.createElement('script');\n            gcse.type = 'text/javascript';\n            gcse.async = true;\n            gcse.src = 'https://cse.google.com/cse.js?cx=' + cx;\n            var s = document.getElementsByTagName('script')[0];\n            s.parentNode.insertBefore(gcse, s);\n        })();");
+      var js1 = "(function() {\n            var cx = ".concat(toJs(cx), ";\n            var gcse = document.createElement('script');\n            gcse.type = 'text/javascript';\n            gcse.async = true;\n            gcse.src = 'https://cse.google.com/cse.js?cx=' + cx;\n            var s = document.getElementsByTagName('script')[0];\n            s.parentNode.insertBefore(gcse, s);\n        })();");
       return (0, _inferno.createFragment)([(0, _inferno.createVNode)(1, "style", null, null, 1, {
         "dangerouslySetInnerHTML": {
           __html: css

package/lib/view/search/insight.js

@@ -22,6 +22,8 @@ var _require = require('inferno'),
   Component = _require.Component;
 var _require2 = require('../../util/cache'),
   cacheComponent = _require2.cacheComponent;
+var _require3 = require('../../util/script'),
+  toJs = _require3.toJs;
 
 /**
  * Algolia search engine JSX component.
@@ -52,9 +54,9 @@ var Insight = /*#__PURE__*/function (_Component) {
         translation = _this$props.translation,
         contentUrl = _this$props.contentUrl,
         jsUrl = _this$props.jsUrl;
-      var js = "document.addEventListener('DOMContentLoaded', function () {\n            loadInsight(".concat(JSON.stringify({
+      var js = "document.addEventListener('DOMContentLoaded', function () {\n            loadInsight(".concat(toJs({
         contentUrl: contentUrl
-      }), ", ").concat(JSON.stringify(translation), ");\n        });");
+      }), ", ").concat(toJs(translation), ");\n        });");
       return (0, _inferno.createFragment)([(0, _inferno.createVNode)(1, "div", "searchbox", (0, _inferno.createVNode)(1, "div", "searchbox-container", [(0, _inferno.createVNode)(1, "div", "searchbox-header", [(0, _inferno.createVNode)(1, "div", "searchbox-input-container", (0, _inferno.createVNode)(64, "input", "searchbox-input", null, 1, {
         "type": "text",
         "placeholder": translation.hint

package/lib/view/share/addthis.js

@@ -22,10 +22,13 @@ var _require = require('inferno'),
   Component = _require.Component;
 var _require2 = require('../../util/cache'),
   cacheComponent = _require2.cacheComponent;
+var _require3 = require('../../util/deprecate'),
+  deprecate = _require3.deprecate;
 
 /**
  * AddThis share buttons JSX component.
  *
+ * @deprecated AddThis shut down on May 31, 2023. Use AddToAny or ShareThis instead.
  * @see https://www.addthis.com/dashboard
  * @example
  * <AddThis installUrl="******" />
@@ -39,6 +42,7 @@ var AddThis = /*#__PURE__*/function (_Component) {
   return _createClass(AddThis, [{
     key: "render",
     value: function render() {
+      deprecate('share.addthis', 'AddThis shut down on May 31, 2023. Use AddToAny or ShareThis instead.');
       var installUrl = this.props.installUrl;
       if (!installUrl) {
         return (0, _inferno.createVNode)(1, "div", "notification is-danger", [(0, _inferno.createTextVNode)("You need to set "), (0, _inferno.createVNode)(1, "code", null, "install_url", 16), (0, _inferno.createTextVNode)(" to use AddThis. Please set it in"), (0, _inferno.createTextVNode)(' '), (0, _inferno.createVNode)(1, "code", null, "_config.yml", 16), (0, _inferno.createTextVNode)(".")], 0);

package/lib/view/widget/archives.js

@@ -25,6 +25,19 @@ var _require2 = require('../../util/cache'),
 var _require3 = require('../../util/i18n'),
   translate = _require3.translate;
 
+/**
+ * Get the first value that is set, i.e., neither null nor undefined.
+ * @private
+ */
+function firstSet() {
+  for (var _len = arguments.length, values = new Array(_len), _key = 0; _key < _len; _key++) {
+    values[_key] = arguments[_key];
+  }
+  return values.find(function (value) {
+    return value !== null && typeof value !== 'undefined';
+  });
+}
+
 /**
  * Convert a Hexo language code into a Moment.js locale name.
  * <p>
@@ -128,11 +141,11 @@ Archives.Cacheable = cacheComponent(Archives, 'widget.archives', function (props
     group_by = _widget$group_by === void 0 ? 'monthly' : _widget$group_by,
     _widget$order = widget.order,
     order = _widget$order === void 0 ? -1 : _widget$order,
-    _widget$showCount = widget.showCount,
-    showCount = _widget$showCount === void 0 ? true : _widget$showCount,
     _widget$format = widget.format,
     format = _widget$format === void 0 ? null : _widget$format,
     amount = widget.amount;
+  // show_count, like the tags widget, or showCount, which this widget used to read
+  var showCount = firstSet(widget.show_count, widget.showCount, true);
   var url_for = helper.url_for,
     _p = helper._p,
     __ = helper.__;

package/lib/view/widget/categories.js

@@ -25,6 +25,19 @@ var _require2 = require('../../util/cache'),
 var _require3 = require('../../util/i18n'),
   translate = _require3.translate;
 
+/**
+ * Get the first value that is set, i.e., neither null nor undefined.
+ * @private
+ */
+function firstSet() {
+  for (var _len = arguments.length, values = new Array(_len), _key = 0; _key < _len; _key++) {
+    values[_key] = arguments[_key];
+  }
+  return values.find(function (value) {
+    return value !== null && typeof value !== 'undefined';
+  });
+}
+
 /**
  * Categories widget JSX component.
  *
@@ -114,25 +127,22 @@ Categories.Cacheable = cacheComponent(Categories, 'widget.categories', function
     widget = _props$widget === void 0 ? {} : _props$widget;
   var _widget$categories = widget.categories,
     categories = _widget$categories === void 0 ? props.site.categories : _widget$categories,
-    _widget$orderBy = widget.orderBy,
-    orderBy = _widget$orderBy === void 0 ? 'name' : _widget$orderBy,
     _widget$order = widget.order,
     order = _widget$order === void 0 ? 1 : _widget$order,
-    _widget$showCurrent = widget.showCurrent,
-    showCurrent = _widget$showCurrent === void 0 ? false : _widget$showCurrent,
-    _widget$showCount = widget.showCount,
-    showCount = _widget$showCount === void 0 ? true : _widget$showCount,
     amount = widget.amount;
+  // Snake case, like the tags widget, or camel case, which this widget used to read
+  var orderBy = firstSet(widget.order_by, widget.orderBy, 'name');
+  var showCurrent = firstSet(widget.show_current, widget.showCurrent, false);
+  var showCount = firstSet(widget.show_count, widget.showCount, true);
   var url_for = helper.url_for,
     _p = helper._p,
     __ = helper.__;
   if (!categories || !categories.length) {
     return null;
   }
-  var depth = 0;
-  try {
-    depth = parseInt(props.depth, 10);
-  } catch (e) {}
+
+  // 0 or no depth shows all levels
+  var depth = parseInt(firstSet(widget.depth, props.depth), 10) || 0;
   function prepareQuery(parent) {
     var query = {};
     if (parent) {

package/lib/view/widget/links.js

@@ -95,7 +95,7 @@ var Links = /*#__PURE__*/function (_Component) {
 Links.Cacheable = cacheComponent(Links, 'widget.links', function (props) {
   var helper = props.helper,
     widget = props.widget;
-  if (!Object.keys(widget.links).length) {
+  if (!widget.links || !Object.keys(widget.links).length) {
     return null;
   }
   return {

package/lib/view/widget/subscribe_email.js

@@ -22,10 +22,14 @@ var _require = require('inferno'),
   Component = _require.Component;
 var _require2 = require('../../util/cache'),
   cacheComponent = _require2.cacheComponent;
+var _require3 = require('../../util/deprecate'),
+  deprecate = _require3.deprecate;
 
 /**
  * Google FeedBurner widget JSX component.
  *
+ * @deprecated Google FeedBurner stopped email subscriptions in July 2021. Use the follow.it widget
+ *     instead.
  * @see https://feedburner.google.com/
  * @example
  * <SubscribeEmail
@@ -43,6 +47,7 @@ var SubscribeEmail = /*#__PURE__*/function (_Component) {
   return _createClass(SubscribeEmail, [{
     key: "render",
     value: function render() {
+      deprecate('widget.subscribe_email', 'Google FeedBurner stopped email subscriptions in July 2021. Use the follow.it widget instead.');
       var _this$props = this.props,
         title = _this$props.title,
         description = _this$props.description,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hexo-component-inferno",
-  "version": "4.1.0",
+  "version": "4.2.0",
   "description": "A collection of Inferno.js layout components and utility scripts for Hexo",
   "main": "lib/index.js",
   "repository": "https://github.com/ppoffice/hexo-component-inferno",
@@ -44,13 +44,15 @@
     "eslint-plugin-jest": "^27.6.3",
     "eslint-plugin-json": "^3.1.0",
     "eslint-plugin-react": "^7.33.2",
-    "hexo": "^7.1.1",
+    "hexo": "^8.1.2",
     "hexo-renderer-marked": "^6.2.0",
     "html-minifier": "^4.0.0",
     "inferno-server": "^8.2.3",
     "inferno-test-utils": "^8.2.3",
     "jest": "^29.7.0",
     "jest-environment-jsdom": "^29.7.0",
+    "jquery": "^3.7.1",
+    "jsdom": "^20.0.3",
     "jsdoc": "^4.0.2",
     "minami": "^1.2.3",
     "prettier": "^3.2.4",