Merge 212afd8 into 9076422

hexojs · Jul 25, 2020 · c69d846 · c69d846
2 parents 9076422 + 212afd8
commit c69d846
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 27 deletions.
diff --git a/lib/plugins/filter/after_render/meta_generator.js b/lib/plugins/filter/after_render/meta_generator.js
@@ -14,7 +14,7 @@ function hexoMetaGeneratorInject(data) {
 
   META_GENERATOR_TAG = META_GENERATOR_TAG || `<meta name="generator" content="Hexo ${this.version}">`;
 
-  return data.replace(/<head>(?!<\/head>).+?<\/head>/s, str => str.replace('</head>', `${META_GENERATOR_TAG}</head>`));
+  return data.replace('</head>', `${META_GENERATOR_TAG}</head>`);
 }
 
 module.exports = hexoMetaGeneratorInject;
diff --git a/test/scripts/filters/meta_generator.js b/test/scripts/filters/meta_generator.js
@@ -37,32 +37,6 @@ describe('Meta Generator', () => {
     should.not.exist(metaGenerator('<head><link><meta content="foo" name="generator"></head>'));
   });
 
-  it('ignore empty head tag', () => {
-    const content = '<head></head><head><link></head><head></head>';
-    hexo.config.meta_generator = true;
-    const result = metaGenerator(content);
-
-    const $ = cheerio.load(result);
-    $('meta[name="generator"]').should.have.lengthOf(1);
-
-    const expected = '<head></head><head><link><meta name="generator" content="Hexo '
-      + hexo.version + '"></head><head></head>';
-    result.should.eql(expected);
-  });
-
-  it('apply to first non-empty head tag only', () => {
-    const content = '<head></head><head><link></head><head><link></head>';
-    hexo.config.meta_generator = true;
-    const result = metaGenerator(content);
-
-    const $ = cheerio.load(result);
-    $('meta[name="generator"]').should.have.lengthOf(1);
-
-    const expected = '<head></head><head><link><meta name="generator" content="Hexo '
-      + hexo.version + '"></head><head><link></head>';
-    result.should.eql(expected);
-  });
-
   // Test for Issue #3777
   it('multi-line head', () => {
     const content = '<head>\n<link>\n</head>';