fix(meta_generator): avoid an edge case (#4017)

hexojs · Dec 30, 2019 · ffa0648 · ffa0648
1 parent f332669
commit ffa0648
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/lib/plugins/filter/after_render/meta_generator.js b/lib/plugins/filter/after_render/meta_generator.js
@@ -3,7 +3,7 @@
 function hexoMetaGeneratorInject(data) {
   const { config } = this;
   if (!config.meta_generator
-    || data.match(/<meta\s+name=['|"]?generator['|"]?/i)) return;
+    || data.match(/<meta([\s]+|[\s]+[^<>]+[\s]+)name=['|"]?generator['|"]?/i)) return;
 
   const hexoGeneratorTag = `<meta name="generator" content="Hexo ${this.version}">`;
 

diff --git a/test/scripts/filters/meta_generator.js b/test/scripts/filters/meta_generator.js
@@ -25,13 +25,11 @@ describe('Meta Generator', () => {
   });
 
   it('no duplicate generator tag', () => {
-    const content = '<head><link>'
-      + '<meta name="generator" content="foo"></head>';
     hexo.config.meta_generator = true;
-    const result = metaGenerator(content);
+    const resultType = str => typeof metaGenerator(str);
 
-    const resultType = typeof result;
-    resultType.should.eql('undefined');
+    resultType('<head><link><meta name="generator" content="foo"></head>').should.eql('undefined');
+    resultType('<head><link><meta content="foo" name="generator"></head>').should.eql('undefined');
   });
 
   it('ignore empty head tag', () => {