refactor(injector): split injector from filter

Make sure injector is executed before after_route_render
hexojs · Feb 6, 2020 · 18421ce · 18421ce
1 parent 789614d
commit 18421ce
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 9 deletions.
diff --git a/lib/hexo/index.js b/lib/hexo/index.js
@@ -25,9 +25,9 @@ const defaultConfig = require('./default_config');
 const loadDatabase = require('./load_database');
 const multiConfigPath = require('./multi_config_path');
 const { sync } = require('resolve');
-const full_url_for = require('../plugins/helper/full_url_for');
+const injectorFilter = require('../plugins/injector');
 const { inherits } = require('util');
-const { deepMerge } = require('hexo-util');
+const { deepMerge, full_url_for } = require('hexo-util');
 
 const libDir = dirname(__dirname);
 const dbVersion = 1;
@@ -57,6 +57,7 @@ const createLoadThemeRoute = function(generatorResult, locals, ctx) {
       if (view) {
         log.debug(`Rendering HTML ${name}: ${magenta(path)}`);
         return view.render(locals)
+          .then(result => injectorFilter.call(ctx, result, locals))
           .then(result => ctx.execFilter('after_route_render', result, {
             context: ctx,
             args: [locals]

diff --git a/lib/plugins/filter/after_render/index.js b/lib/plugins/filter/after_render/index.js
@@ -5,5 +5,4 @@ module.exports = ctx => {
 
   filter.register('after_route_render', require('./external_link'));
   filter.register('after_route_render', require('./meta_generator'));
-  filter.register('after_route_render', require('./injector'));
 };
diff --git a/lib/plugins/filter/after_render/injector.js → lib/plugins/injector/index.js b/lib/plugins/filter/after_render/injector.js → lib/plugins/injector/index.js
diff --git a/package.json b/package.json
@@ -71,14 +71,14 @@
     "chai": "^4.1.2",
     "chai-as-promised": "^7.1.1",
     "cheerio": "0.22.0",
+    "decache": "^4.5.1",
     "eslint": "^6.0.1",
     "eslint-config-hexo": "^4.1.0",
     "hexo-renderer-marked": "^2.0.0",
     "husky": "^3.0.0",
     "lint-staged": "^9.1.0",
     "mocha": "^6.0.0",
     "nyc": "^15.0.0",
-    "resnap": "^1.0.1",
     "rewire": "^4.0.1",
     "sinon": "^8.0.1"
   },

diff --git a/test/index.js b/test/index.js
@@ -10,6 +10,7 @@ describe('Hexo', () => {
   require('./scripts/generators');
   require('./scripts/helpers');
   require('./scripts/hexo');
+  require('./scripts/injector');
   require('./scripts/models');
   require('./scripts/processors');
   require('./scripts/renderers');

diff --git a/test/scripts/filters/index.js b/test/scripts/filters/index.js
@@ -5,7 +5,6 @@ describe('Filters', () => {
   require('./excerpt');
   require('./external_link');
   require('./i18n_locals');
-  require('./injector');
   require('./meta_generator');
   require('./new_post_path');
   require('./post_permalink');

diff --git a/test/scripts/filters/injector.js → test/scripts/injector/index.js b/test/scripts/filters/injector.js → test/scripts/injector/index.js
@@ -1,15 +1,15 @@
 'use strict';
 
-const resetCache = require('resnap')();
+const decache = require('decache');
 
 describe('Injector', () => {
   const Hexo = require('../../../lib/hexo');
   let hexo, injectorFilter;
 
-  beforeEach(() => {
+  beforeEach(async () => {
+    await decache('../../../lib/plugins/injector');
     hexo = new Hexo();
-    resetCache();
-    injectorFilter = require('../../../lib/plugins/filter/after_render/injector').bind(hexo);
+    injectorFilter = require('../../../lib/plugins/injector').bind(hexo);
   });
 
   const content = [