hexo-component-inferno 4.1.0 → 4.2.0

package/lib/hexo/generator/manifest.js

@@ -38,6 +38,12 @@ module.exports = function (hexo) {
     if (!manifest.start_url) {
       manifest.start_url = url_for('/index.html');
     }
+    if (Array.isArray(manifest.icons)) {
+      // Resolve the icons against the root of the site, like start_url
+      manifest.icons = manifest.icons.map(icon => icon && icon.src ? Object.assign({}, icon, {
+        src: url_for(icon.src)
+      }) : icon);
+    }
     return {
       path: '/manifest.json',
       data: JSON.stringify(manifest)

package/lib/hexo/helper/cdn.js

@@ -70,7 +70,7 @@ const UNPKG_FIXTURES = {
  *
  * // Use the function below to insert FontAwesome icon font CSS URL.
  * iconcdn();
- * // -> https://use.fontawesome.com/releases/v5.15.2/css/all.css
+ * // -> https://use.fontawesome.com/releases/v6.0.0/css/all.css
  */
 module.exports = function (hexo) {
   function applyFixture(fixture, _package, version, filename) {

package/lib/hexo/tag/message.js

@@ -3,6 +3,16 @@
  * @module hexo/tag/message
  */
 
+/**
+ * Split a tag option at its first colon, so that the value can contain colons, as in
+ * <code>'title:Step 1: Install'</code>.
+ * @private
+ */
+function splitOption(option) {
+  const index = option.indexOf(':');
+  return index === -1 ? [option] : [option.slice(0, index), option.slice(index + 1)];
+}
+
 /**
  * Register custom Hexo tag {% message %}.
  * <p>
@@ -53,7 +63,7 @@ module.exports = function (hexo) {
     let classes = '';
     let header = '';
     for (const option of options) {
-      const [key, value] = option.split(':');
+      const [key, value] = splitOption(option);
       switch (key) {
         case 'size':
           classes += ` is-${value}`;

package/lib/hexo/tag/tabs.js

@@ -3,6 +3,16 @@
  * @module hexo/tag/tabs
  */
 
+/**
+ * Split a tag option at its first colon, so that the value can contain colons, as in
+ * <code>'title:Step 1: Install'</code>.
+ * @private
+ */
+function splitOption(option) {
+  const index = option.indexOf(':');
+  return index === -1 ? [option] : [option.slice(0, index), option.slice(index + 1)];
+}
+
 /**
  * Register custom Hexo tag {% tabs %}.
  * <p>
@@ -151,10 +161,11 @@ module.exports = function (hexo) {
     }
     return options;
   }
+  let tabCount = 0;
   function processTag(options, content) {
     let classes = '';
     for (const option of options) {
-      const [key, value] = option.split(':');
+      const [key, value] = splitOption(option);
       switch (key) {
         case 'align':
           classes += ` is-${value}`;
@@ -176,12 +187,14 @@ module.exports = function (hexo) {
     let contentElements = '';
     while ((match = pattern.exec(content)) !== null) {
       const [, tabOptions, tabContent] = match;
-      let id = 'tab-' + Date.now() + (Math.random() * 1000 | 0);
+
+      // A counter, as random numbers in the same millisecond could be the same
+      let id = 'tab-' + Date.now() + '-' + tabCount++;
       let icon = '';
       let title = '';
       let active = false;
       for (const option of splitTabOptions(tabOptions)) {
-        const [key, value] = option.split(':');
+        const [key, value] = splitOption(option);
         switch (key) {
           case 'id':
             id = value;
@@ -228,7 +241,12 @@ module.exports = function (hexo) {
             return;
           }
 
-          const id = '#' + CSS.escape(location.hash.substring(1));
+          let hash = location.hash.substring(1);
+          try {
+            // Non-ASCII IDs are percent-encoded in the URL
+            hash = decodeURIComponent(hash);
+          } catch (e) {}
+          const id = '#' + CSS.escape(hash);
           const $tabMenu = document.querySelector(\`.tabs a[href="\${id}"]\`);
           if (!$tabMenu) {
             return;
@@ -248,7 +266,12 @@ module.exports = function (hexo) {
               $activeTab.classList.remove('is-hidden');
           }
       }
-      switchTab();
+      // The script is in <head>, so wait for the tabs to switch to the tab in the URL
+      if (document.readyState === 'loading') {
+          document.addEventListener('DOMContentLoaded', switchTab);
+      } else {
+          switchTab();
+      }
       window.addEventListener('hashchange', switchTab, false);
   })();
   </script>`;

package/lib/schema/comment/giscus.json

@@ -33,6 +33,11 @@
       "default": "pathname",
       "nullable": true
     },
+    "term": {
+      "type": ["string", "number"],
+      "description": "The search term of the discussion when mapping is specific, or the discussion number when mapping is number",
+      "nullable": true
+    },
     "strict": {
       "type": "boolean",
       "description": "Avoid mismatches due to GitHub's fuzzy searching method when there are multiple discussions with similar titles",

package/lib/schema/comment/gitment.json

@@ -1,7 +1,7 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
   "$id": "/comment/gitment.json",
-  "description": "Gitment comment plugin configurations",
+  "description": "Gitment comment plugin configurations\nDEPRECATED: Gitment is no longer maintained, and the GitHub sign-in proxy it uses no longer works. Use Giscus, Utterances or Gitalk instead.",
   "type": "object",
   "properties": {
     "type": {

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\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.",
+  "description": "Valine comment plugin configurations\nDEPRECATED: LeanCloud, where Valine stores the comments, shuts down on January 12, 2027. Use Waline, Twikoo or another comment system instead.\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": {

package/lib/schema/comment/waline.json

@@ -14,7 +14,7 @@
     },
     "path": {
       "type": "string",
-      "description": "Article path id."
+      "description": "Article path id. A path, such as /posts/hello/, or a JavaScript expression, such as window.location.pathname, which is the default."
     },
     "lang": {
       "type": "string",

package/lib/schema/misc/open_graph.json

@@ -12,7 +12,6 @@
     "type": {
       "type": "string",
       "description": "Page type (og:type) (optional)\nYou should leave this blank for most of the time",
-      "default": "blog",
       "nullable": true
     },
     "url": {

package/lib/schema/plugin/waline_pageview.json

@@ -1,7 +1,7 @@
 {
   "$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",
+  "description": "Waline page view counter, true to use the server of the Waline comments. 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": {

package/lib/schema/share/addthis.json

@@ -1,7 +1,7 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
   "$id": "/share/addthis.json",
-  "description": "Enable AddThis share buttons\nhttps://www.addthis.com/",
+  "description": "Enable AddThis share buttons\nDEPRECATED: AddThis shut down on May 31, 2023. Use AddToAny or ShareThis instead.",
   "type": "object",
   "properties": {
     "type": {

package/lib/schema/widget/archives.json

@@ -12,6 +12,29 @@
       "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
+    },
+    "group_by": {
+      "type": "string",
+      "enum": ["monthly", "yearly"],
+      "description": "Whether to group the archives by month or by year. Groups by month if not set",
+      "nullable": true
+    },
+    "order": {
+      "type": "integer",
+      "enum": [1, -1],
+      "description": "1 to show the oldest archives first, or -1 to show the newest first. Shows the newest first if not set",
+      "nullable": true
+    },
+    "format": {
+      "type": "string",
+      "description": "Moment.js format of the archive names, such as 'MMMM YYYY' (by month) or 'YYYY' (by year), which are used if not set",
+      "nullable": true
+    },
+    "show_count": {
+      "type": "boolean",
+      "default": true,
+      "description": "Whether to show the number of posts of each archive",
+      "nullable": true
     }
   },
   "required": ["type"]

package/lib/schema/widget/categories.json

@@ -12,6 +12,33 @@
       "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
+    },
+    "order_by": {
+      "type": "string",
+      "description": "How to order the categories. For example 'name' to order by name, and 'length' to order by number of posts. Orders by name if not set",
+      "nullable": true
+    },
+    "order": {
+      "type": "integer",
+      "enum": [1, -1],
+      "description": "1 for ascending order, or -1 for descending order. Ascending if not set",
+      "nullable": true
+    },
+    "depth": {
+      "type": "integer",
+      "description": "Levels of categories to show, for example 1 for the top-level categories only. Shows all levels if not set or 0",
+      "nullable": true
+    },
+    "show_current": {
+      "type": "boolean",
+      "description": "Whether to highlight the categories of the current post",
+      "nullable": true
+    },
+    "show_count": {
+      "type": "boolean",
+      "default": true,
+      "description": "Whether to show the number of posts of each category",
+      "nullable": true
     }
   },
   "required": ["type"]

package/lib/schema/widget/recent_posts.json

@@ -7,6 +7,11 @@
     "type": {
       "type": "string",
       "const": "recent_posts"
+    },
+    "limit": {
+      "type": "integer",
+      "description": "Number of recent posts to show. Shows 5 if not set",
+      "nullable": true
     }
   },
   "required": ["type"]

package/lib/schema/widget/subscribe_email.json

@@ -1,7 +1,7 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
   "$id": "/widget/subscribe_email.json",
-  "description": "Google FeedBurner email subscription widget configurations",
+  "description": "Google FeedBurner email subscription widget configurations\nDEPRECATED: Google FeedBurner stopped email subscriptions in July 2021. Use the follow.it widget instead.",
   "type": "object",
   "properties": {
     "type": {

package/lib/util/classname.js

@@ -19,7 +19,7 @@ module.exports = function (classname) {
   if (Array.isArray(classname)) {
     return classname.join(' ');
   }
-  if (typeof classname === 'object') {
+  if (classname !== null && typeof classname === 'object') {
     return Object.keys(classname).filter(key => !!classname[key]).join(' ');
   }
   throw new Error('Cannot process class name ' + JSON.stringify(classname));

package/lib/util/deprecate.js

@@ -0,0 +1,28 @@
+/**
+ * Utility functions for warning about deprecated components.
+ * @module util/deprecate
+ */
+
+const warned = new Set();
+
+/**
+ * Print a warning about a deprecated component, once per component.
+ * <p>
+ * Components are rendered for every page, so the warning is only printed the first time.
+ *
+ * @param {string} name Name of the component, such as <code>share.addthis</code>.
+ * @param {string} message Why the component is deprecated, and what to use instead.
+ * @example
+ * deprecate('share.addthis', 'AddThis shut down on May 31, 2023. Use AddToAny or ShareThis instead.');
+ */
+function deprecate(name, message) {
+  if (warned.has(name)) {
+    return;
+  }
+  warned.add(name);
+  // eslint-disable-next-line no-console
+  console.warn(`hexo-component-inferno: ${name} is deprecated. ${message}`);
+}
+module.exports = {
+  deprecate
+};

package/lib/util/html.js

@@ -0,0 +1,51 @@
+/**
+ * Utility functions for HTML text.
+ * @module util/html
+ */
+const {
+  stripHTML
+} = require('hexo-util');
+const ENTITIES = {
+  amp: '&',
+  lt: '<',
+  gt: '>',
+  quot: '"',
+  apos: "'",
+  nbsp: ' '
+};
+
+/**
+ * Decode the character references in HTML text, such as <code>&amp;amp;</code>,
+ * <code>&amp;#39;</code> and <code>&amp;#x1F600;</code>.
+ * <p>
+ * Numeric references and the named ones that Markdown renderers output are decoded. Other named
+ * references are kept as they are.
+ *
+ * @param {string} str HTML text.
+ * @returns {string} The text.
+ */
+function decodeHTML(str) {
+  return str.replace(/&(#x[\da-f]+|#\d+|[a-z]+);/gi, (match, entity) => {
+    if (entity[0] === '#') {
+      const code = entity[1] === 'x' || entity[1] === 'X' ? parseInt(entity.slice(2), 16) : parseInt(entity.slice(1), 10);
+      return code <= 0x10ffff ? String.fromCodePoint(code) : match;
+    }
+    const char = ENTITIES[entity.toLowerCase()];
+    return char === undefined ? match : char;
+  });
+}
+
+/**
+ * Convert HTML to plain text on one line, for example to index or describe a page.
+ *
+ * @param {string} html HTML.
+ * @returns {string} The text, with the tags removed, the character references decoded, and the
+ * whitespace collapsed.
+ */
+function toPlainText(html) {
+  return decodeHTML(stripHTML(html || '')).replace(/\s+/g, ' ').trim();
+}
+module.exports = {
+  decodeHTML,
+  toPlainText
+};

package/lib/util/script.js

@@ -3,6 +3,23 @@
  * @module util/script
  */
 
+/**
+ * Convert a value to JavaScript code that can be put in an inline <code>&lt;script&gt;</code>.
+ * <p>
+ * Unlike <code>JSON.stringify</code> alone, it escapes <code>&lt;</code>, so that a value containing
+ * <code>&lt;/script&gt;</code>, such as a page title, cannot end the inline script, and the line
+ * separators U+2028 and U+2029, which older browsers do not allow in JavaScript strings.
+ *
+ * @param {any} value A value that can be converted to JSON.
+ * @returns {string} The JavaScript code.
+ *
+ * @example
+ * toJs('</script>'); // '"\\u003c/script>"'
+ */
+function toJs(value) {
+  return JSON.stringify(value).replace(/</g, '\\u003c').replace(/\u2028/g, '\\u2028').replace(/\u2029/g, '\\u2029');
+}
+
 /**
  * Build an inline script that loads external scripts asynchronously and in order, and then runs the
  * given code.
@@ -22,8 +39,8 @@
  */
 function loadScripts(urls, code, attrs = {}) {
   return `(function () {
-    var urls = ${JSON.stringify([].concat(urls))};
-    var attrs = ${JSON.stringify(attrs)};
+    var urls = ${toJs([].concat(urls))};
+    var attrs = ${toJs(attrs)};
     function run() {
       ${code}
     }
@@ -54,6 +71,11 @@ function loadScripts(urls, code, attrs = {}) {
         script.addEventListener('load', function () {
           this.setAttribute('data-loaded', 'true');
         });
+        // Remove a script that fails to load, so that the next run, e.g., after a PJAX page switch,
+        // adds it again instead of waiting for it
+        script.addEventListener('error', function () {
+          this.remove();
+        });
         document.head.appendChild(script);
       }
       script.addEventListener('load', function () {
@@ -87,19 +109,19 @@ function loadScripts(urls, code, attrs = {}) {
  * });
  */
 function appendScript(selector, url, attrs, dynamicAttrs = {}) {
-  const dynamic = Object.keys(dynamicAttrs).map(name => `attrs[${JSON.stringify(name)}] = ${dynamicAttrs[name]};`).join('\n    ');
+  const dynamic = Object.keys(dynamicAttrs).map(name => `attrs[${toJs(name)}] = ${dynamicAttrs[name]};`).join('\n    ');
   return `(function () {
-    var element = document.querySelector(${JSON.stringify(selector)});
+    var element = document.querySelector(${toJs(selector)});
     if (!element) {
       return;
     }
-    var attrs = ${JSON.stringify(attrs)};
+    var attrs = ${toJs(attrs)};
     ${dynamic}
     var script = document.createElement('script');
     for (var name in attrs) {
       script.setAttribute(name, attrs[name]);
     }
-    script.src = ${JSON.stringify(url)};
+    script.src = ${toJs(url)};
     script.async = true;
     setTimeout(function () {
       element.appendChild(script);
@@ -107,4 +129,5 @@ function appendScript(selector, url, attrs, dynamicAttrs = {}) {
   })();`;
 }
 module.exports = loadScripts;
-module.exports.appendScript = appendScript;
+module.exports.appendScript = appendScript;
+module.exports.toJs = toJs;

package/lib/view/comment/artalk.js

@@ -23,6 +23,7 @@ var _require = require('inferno'),
 var _require2 = require('../../util/cache'),
   cacheComponent = _require2.cacheComponent;
 var loadScripts = require('../../util/script');
+var toJs = loadScripts.toJs;
 var _require3 = require('../../util/appearance'),
   getAppearance = _require3.getAppearance,
   isDark = _require3.isDark;
@@ -64,9 +65,9 @@ var Artalk = /*#__PURE__*/function (_Component) {
         return (0, _inferno.createVNode)(1, "div", "notification is-danger", [(0, _inferno.createTextVNode)("You forgot to set the "), (0, _inferno.createVNode)(1, "code", null, "server", 16), (0, _inferno.createTextVNode)(" for Artalk. Please set it in"), (0, _inferno.createTextVNode)(' '), (0, _inferno.createVNode)(1, "code", null, "_config.yml", 16), (0, _inferno.createTextVNode)(".")], 0);
       }
       // Without the dark_mode option, follow the appearance of the page
-      var darkModeOption = darkMode === null || typeof darkMode === 'undefined' ? "".concat(getAppearance(), " === 'auto' ? 'auto' : ").concat(isDark()) : JSON.stringify(darkMode);
+      var darkModeOption = darkMode === null || typeof darkMode === 'undefined' ? "".concat(getAppearance(), " === 'auto' ? 'auto' : ").concat(isDark()) : toJs(darkMode);
       // PJAX replaces the element of the previous instance, so destroy it before initializing again
-      var js = "if (window.__artalkInstance) {\n            window.__artalkInstance.destroy();\n        }\n        window.__artalkInstance = Artalk.init({\n            el: '#artalk-thread',\n            server: ".concat(JSON.stringify(server), ",\n            ").concat(site ? "site: ".concat(JSON.stringify(site), ",") : '', "\n            ").concat(pageKey ? "pageKey: ".concat(JSON.stringify(pageKey), ",") : '', "\n            ").concat(pageTitle ? "pageTitle: ".concat(JSON.stringify(pageTitle), ",") : '', "\n            ").concat(locale ? "locale: ".concat(JSON.stringify(locale), ",") : '', "\n            darkMode: ").concat(darkModeOption, ",\n        });");
+      var js = "if (window.__artalkInstance) {\n            window.__artalkInstance.destroy();\n        }\n        window.__artalkInstance = Artalk.init({\n            el: '#artalk-thread',\n            server: ".concat(toJs(server), ",\n            ").concat(site ? "site: ".concat(toJs(site), ",") : '', "\n            ").concat(pageKey ? "pageKey: ".concat(toJs(pageKey), ",") : '', "\n            ").concat(pageTitle ? "pageTitle: ".concat(toJs(pageTitle), ",") : '', "\n            ").concat(locale ? "locale: ".concat(toJs(locale), ",") : '', "\n            darkMode: ").concat(darkModeOption, ",\n        });");
       return (0, _inferno.createFragment)([(0, _inferno.createVNode)(1, "div", null, null, 1, {
         "id": "artalk-thread"
       }), (0, _inferno.createVNode)(1, "link", null, null, 1, {

package/lib/view/comment/beaudar.js

@@ -23,7 +23,8 @@ var _require = require('inferno'),
 var _require2 = require('../../util/cache'),
   cacheComponent = _require2.cacheComponent;
 var _require3 = require('../../util/script'),
-  appendScript = _require3.appendScript;
+  appendScript = _require3.appendScript,
+  toJs = _require3.toJs;
 var _require4 = require('../../util/appearance'),
   isDark = _require4.isDark;
 
@@ -80,7 +81,7 @@ var Beaudar = /*#__PURE__*/function (_Component) {
       config.crossorigin = 'anonymous';
       // Use the dark theme when the page looks dark
       var js = appendScript('#beaudar-thread', 'https://beaudar.lipk.org/client.js', config, {
-        theme: "".concat(isDark(), " ? ").concat(JSON.stringify(darkTheme || 'github-dark'), " : ").concat(JSON.stringify(theme || 'github-light'))
+        theme: "".concat(isDark(), " ? ").concat(toJs(darkTheme || 'github-dark'), " : ").concat(toJs(theme || 'github-light'))
       });
       return (0, _inferno.createFragment)([(0, _inferno.createVNode)(1, "div", null, null, 1, {
         "id": "beaudar-thread"

package/lib/view/comment/changyan.js

@@ -23,6 +23,7 @@ var _require = require('inferno'),
 var _require2 = require('../../util/cache'),
   cacheComponent = _require2.cacheComponent;
 var loadScripts = require('../../util/script');
+var toJs = loadScripts.toJs;
 
 /**
  * ChangYan comment JSX component.
@@ -50,7 +51,7 @@ var ChangYan = /*#__PURE__*/function (_Component) {
       if (!appId || !conf) {
         return (0, _inferno.createVNode)(1, "div", "notification is-danger", [(0, _inferno.createTextVNode)("You forgot to set the "), (0, _inferno.createVNode)(1, "code", null, "app_id", 16), (0, _inferno.createTextVNode)(" or "), (0, _inferno.createVNode)(1, "code", null, "conf", 16), (0, _inferno.createTextVNode)(" for Changyan. Please set it in "), (0, _inferno.createVNode)(1, "code", null, "_config.yml", 16), (0, _inferno.createTextVNode)(".")], 4);
       }
-      var js = "window.changyan.api.config({appid: '".concat(appId, "',conf: '").concat(conf, "'});");
+      var js = "window.changyan.api.config({appid: ".concat(toJs(appId), ",conf: ").concat(toJs(conf), "});");
       /* eslint-disable react/no-unknown-property */
       return (0, _inferno.createFragment)([(0, _inferno.createVNode)(1, "div", null, null, 1, {
         "id": "SOHUCS",

package/lib/view/comment/cusdis.js

@@ -23,6 +23,7 @@ var _require = require('inferno'),
 var _require2 = require('../../util/cache'),
   cacheComponent = _require2.cacheComponent;
 var loadScripts = require('../../util/script');
+var toJs = loadScripts.toJs;
 var _require3 = require('../../util/appearance'),
   getAppearance = _require3.getAppearance;
 
@@ -68,7 +69,7 @@ var Cusdis = /*#__PURE__*/function (_Component) {
       // Without the theme option, follow the appearance of the page (light, dark, or auto, the same values
       // as the themes of Cusdis). The Cusdis script renders #cusdis_thread when it loads, so render it
       // directly only when the script is already loaded, e.g., when PJAX runs this code again.
-      var js = "(function () {\n        var element = document.getElementById('cusdis_thread');\n        if (!element) {\n          return;\n        }\n        element.setAttribute('data-theme', ".concat(theme ? JSON.stringify(theme) : getAppearance(), ");\n        if (window.renderCusdis) {\n          window.renderCusdis(element);\n          return;\n        }\n        ").concat(loadScripts(urls, ''), "\n      })();");
+      var js = "(function () {\n        var element = document.getElementById('cusdis_thread');\n        if (!element) {\n          return;\n        }\n        element.setAttribute('data-theme', ".concat(theme ? toJs(theme) : getAppearance(), ");\n        if (window.renderCusdis) {\n          window.renderCusdis(element);\n          return;\n        }\n        ").concat(loadScripts(urls, ''), "\n      })();");
       return (0, _inferno.createFragment)([(0, _inferno.createVNode)(1, "div", null, null, 1, {
         "id": "cusdis_thread",
         "data-host": host,

package/lib/view/comment/disqus.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;
 
 /**
  * Disqus comment JSX component.
@@ -51,7 +53,7 @@ var Disqus = /*#__PURE__*/function (_Component) {
       if (!shortname) {
         return (0, _inferno.createVNode)(1, "div", "notification is-danger", [(0, _inferno.createTextVNode)("You forgot to set the "), (0, _inferno.createVNode)(1, "code", null, "shortname", 16), (0, _inferno.createTextVNode)(" for Disqus. Please set it in"), (0, _inferno.createTextVNode)(' '), (0, _inferno.createVNode)(1, "code", null, "_config.yml", 16), (0, _inferno.createTextVNode)(".")], 0);
       }
-      var js = "var disqus_config = function () {\n            this.page.url = '".concat(permalink, "';\n            this.page.identifier = '").concat(disqusId || path, "';\n        };\n        (function() {\n            var d = document, s = d.createElement('script');  \n            s.src = '//' + '").concat(shortname, "' + '.disqus.com/embed.js';\n            s.setAttribute('data-timestamp', +new Date());\n            (d.head || d.body).appendChild(s);\n        })();");
+      var js = "var disqus_config = function () {\n            this.page.url = ".concat(toJs(permalink), ";\n            this.page.identifier = ").concat(toJs(disqusId || path), ";\n        };\n        (function() {\n            var d = document, s = d.createElement('script');  \n            s.src = ").concat(toJs("//".concat(shortname, ".disqus.com/embed.js")), ";\n            s.setAttribute('data-timestamp', +new Date());\n            (d.head || d.body).appendChild(s);\n        })();");
       return (0, _inferno.createFragment)([(0, _inferno.createVNode)(1, "div", null, (0, _inferno.createVNode)(1, "noscript", null, [(0, _inferno.createTextVNode)("Please enable JavaScript to view the"), (0, _inferno.createTextVNode)(' '), (0, _inferno.createVNode)(1, "a", null, "comments powered by Disqus.", 16, {
         "href": "//disqus.com/?ref_noscript"
       })], 0), 2, {

package/lib/view/comment/disqusjs.js

@@ -23,6 +23,7 @@ var _require = require('inferno'),
 var _require2 = require('../../util/cache'),
   cacheComponent = _require2.cacheComponent;
 var loadScripts = require('../../util/script');
+var toJs = loadScripts.toJs;
 
 /**
  * DisqusJS comment JSX component.
@@ -67,12 +68,12 @@ var DisqusJs = /*#__PURE__*/function (_Component) {
         siteTitle = _this$props.siteTitle,
         jsUrl = _this$props.jsUrl,
         cssUrl = _this$props.cssUrl;
-      if (!shortname) {
+      if (!shortname || !apiKey) {
         return (0, _inferno.createVNode)(1, "div", "notification is-danger", [(0, _inferno.createTextVNode)("You forgot to set the "), (0, _inferno.createVNode)(1, "code", null, "shortname", 16), (0, _inferno.createTextVNode)(" or "), (0, _inferno.createVNode)(1, "code", null, "api_key", 16), (0, _inferno.createTextVNode)(" for Disqus. Please set it in "), (0, _inferno.createVNode)(1, "code", null, "_config.yml", 16), (0, _inferno.createTextVNode)(".")], 4);
       }
       var url = permalink || path;
       var identifier = disqusId || path;
-      var js = "new DisqusJS({\n            shortname: '".concat(shortname, "',\n            apikey: ").concat(JSON.stringify(apiKey), ",\n            ").concat(siteTitle ? "siteName: ".concat(JSON.stringify(siteTitle), ",") : '', "\n            ").concat(identifier ? "identifier: ".concat(JSON.stringify(identifier), ",") : '', "\n            ").concat(url ? "url: ".concat(JSON.stringify(url), ",") : '', "\n            ").concat(pageTitle ? "title: ".concat(JSON.stringify(pageTitle), ",") : '', "\n            ").concat(api ? "api: ".concat(JSON.stringify(api), ",") : '', "\n            ").concat(admin ? "admin: ".concat(JSON.stringify(admin), ",") : '', "\n            ").concat(adminLabel ? "adminLabel: ".concat(JSON.stringify(adminLabel), ",") : '', "\n            ").concat(nesting ? "nesting: ".concat(JSON.stringify(nesting), ",") : '', "\n        });");
+      var js = "new DisqusJS({\n            shortname: ".concat(toJs(shortname), ",\n            apikey: ").concat(toJs(apiKey), ",\n            ").concat(siteTitle ? "siteName: ".concat(toJs(siteTitle), ",") : '', "\n            ").concat(identifier ? "identifier: ".concat(toJs(identifier), ",") : '', "\n            ").concat(url ? "url: ".concat(toJs(url), ",") : '', "\n            ").concat(pageTitle ? "title: ".concat(toJs(pageTitle), ",") : '', "\n            ").concat(api ? "api: ".concat(toJs(api), ",") : '', "\n            ").concat(admin ? "admin: ".concat(toJs(admin), ",") : '', "\n            ").concat(adminLabel ? "adminLabel: ".concat(toJs(adminLabel), ",") : '', "\n            ").concat(nesting ? "nesting: ".concat(toJs(nesting), ",") : '', "\n        });");
       return (0, _inferno.createFragment)([(0, _inferno.createVNode)(1, "link", null, null, 1, {
         "rel": "stylesheet",
         "href": cssUrl,

package/lib/view/comment/facebook.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;
 
 /**
  * Facebook comment JSX component.
@@ -45,7 +47,7 @@ var Facebook = /*#__PURE__*/function (_Component) {
         language = _this$props.language,
         permalink = _this$props.permalink;
       var fbLanguage = language.split('-').join('_');
-      var js = "(function(d, s, id) {\n            var js, fjs = d.getElementsByTagName(s)[0];\n            if (d.getElementById(id)) return;\n            js = d.createElement(s); js.id = id;\n            js.src = \"//connect.facebook.net/".concat(fbLanguage, "/sdk.js#xfbml=1&version=v12.0\";\n            fjs.parentNode.insertBefore(js, fjs);\n        }(document, 'script', 'facebook-jssdk'));");
+      var js = "(function(d, s, id) {\n            var js, fjs = d.getElementsByTagName(s)[0];\n            // After a PJAX page switch, the SDK is loaded, so render the new comments box with it\n            if (d.getElementById(id)) {\n                if (window.FB) FB.XFBML.parse();\n                return;\n            }\n            js = d.createElement(s); js.id = id;\n            js.src = ".concat(toJs("//connect.facebook.net/".concat(fbLanguage, "/sdk.js#xfbml=1&version=v12.0")), ";\n            fjs.parentNode.insertBefore(js, fjs);\n        }(document, 'script', 'facebook-jssdk'));");
       return (0, _inferno.createFragment)([(0, _inferno.createVNode)(1, "div", "fb-comments", null, 1, {
         "data-width": "100%",
         "data-href": permalink,

package/lib/view/comment/giscus.js

@@ -23,7 +23,8 @@ var _require = require('inferno'),
 var _require2 = require('../../util/cache'),
   cacheComponent = _require2.cacheComponent;
 var _require3 = require('../../util/script'),
-  appendScript = _require3.appendScript;
+  appendScript = _require3.appendScript,
+  toJs = _require3.toJs;
 var _require4 = require('../../util/appearance'),
   isDark = _require4.isDark;
 
@@ -124,7 +125,7 @@ var Giscus = /*#__PURE__*/function (_Component) {
           return (0, _inferno.createVNode)(1, "div", "notification is-danger", [(0, _inferno.createTextVNode)("You set "), (0, _inferno.createVNode)(1, "code", null, "theme", 16), (0, _inferno.createTextVNode)(" to "), (0, _inferno.createVNode)(1, "code", null, "custom", 16), (0, _inferno.createTextVNode)(", but did not apply a"), (0, _inferno.createTextVNode)(' '), (0, _inferno.createVNode)(1, "code", null, "customThemeCss", 16), (0, _inferno.createTextVNode)(" for Giscus. Please set it in "), (0, _inferno.createVNode)(1, "code", null, "_config.yml", 16), (0, _inferno.createTextVNode)(".")], 0);
         }
       } else {
-        dynamicConfig['data-theme'] = "".concat(isDark(), " ? ").concat(JSON.stringify(darkTheme || 'noborder_dark'), " : ").concat(JSON.stringify(theme || 'noborder_light'));
+        dynamicConfig['data-theme'] = "".concat(isDark(), " ? ").concat(toJs(darkTheme || 'noborder_dark'), " : ").concat(toJs(theme || 'noborder_light'));
       }
       if (lang) {
         config['data-lang'] = lang;