feat: use cheerio to prase HTML instead of using regExp

EYHN · Mar 18, 2018 · 05a8e47 · 05a8e47
1 parent e8f736c
commit 05a8e47
Show file tree

Hide file tree

Showing 3 changed files with 116 additions and 8 deletions.
diff --git a/index.js b/index.js
@@ -6,6 +6,7 @@
 'use strict';
 
 const _ = require('lodash');
+const cheerio = require('cheerio');
 const fs = require('hexo-fs');
 const path = require('path');
 const url = require('url');
@@ -183,16 +184,11 @@ if (config.enable) {
    */
   hexo.extend.filter.register('after_render:html', (htmlContent) => {
 
+    const $ = cheerio.load(htmlContent);
     const scriptToInject = `L2Dwidget.init(${JSON.stringify(config)});`;
     const contentToInject = `<script src="${scriptUrlToInject}"></script><script>${scriptToInject}</script>`;
-    let newHtmlContent = htmlContent;
-    if (/<\/body>/gi.test(htmlContent)) {
-
-      const lastIndex = htmlContent.lastIndexOf('</body>');
-      newHtmlContent = `${htmlContent.substring(0, lastIndex)}${contentToInject}${htmlContent.substring(lastIndex, htmlContent.length)}`;
-
-    }
-    return newHtmlContent;
+    $('body').append(contentToInject);
+    return $.html();
 
   });
 

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -10,6 +10,7 @@
     "live2d-widget-model-wanko": "^1.0.5"
   },
   "dependencies": {
+    "cheerio": "^1.0.0-rc.2",
     "colors": "^1.2.1",
     "hexo-fs": "^0.2.2",
     "live2d-widget": "^3.0.5",