perf(meta_generator): drop cheerio #3671

curbengh · 2019-08-16T01:18:00Z

What does it do?

Less breaking alternative to #3669
x-post from that PR:

From the benchmark performed by @SukkaW , we can see cheerio—used by meta_generator filter—incurs significant perf cost. The feature was initially introduced by #3129.

Despite effort to improve the situation (#3667), the improvement was only minuscule. Hence, we try to avoid cheerio if possible.

How to test

git clone -b metagen-cheerio https://github.com/curbengh/hexo.git
cd hexo
npm install
npm test

Pull request tasks

Add test cases for the changes.
Passed the CI test.


        refactor(meta_generator): drop cheerio


        fix(meta_generator): append to </title>


        test(meta_generator): remove irrelevant head tag test


        test(render): disable meta_generator


        fix(meta_generator): do not append if there is existing tag,

regardless the value of 'content'


        test(open_generator): test existing generator tag


        test(meta_generator): tag should be added only once

Previous commit only works on post, not page This reverts commit 325f303.

coveralls · 2019-08-16T01:20:30Z

Coverage decreased (-0.002%) to 97.152% when pulling fb42a5b on curbengh:metagen-cheerio into 49c7d4a on hexojs:master.

stevenjoezhang · 2019-08-16T01:23:45Z

Maybe it's not necessary to use the xhml syntax?

<meta name="generator" content="Hexo %s" />

<meta name="generator" content="Hexo %s">

lib/plugins/filter/meta_generator.js

curbengh · 2019-08-16T02:34:23Z

btw, if anyone's worry about html in a code block, the brackets are encoded,

<figure class="highlight html"><table><tbody><tr><td class="code"><pre><span class="line"><span class="tag">&lt;<span class="name">head</span>&gt;</span><span class="tag">&lt;/<span class="name">head</span>&gt;</span></span><br></pre></td></tr></tbody></table></figure>


        Add a test for hexo pull 3671

hexojs/hexo#3671

curbengh · 2019-08-17T07:57:48Z

I forgot to add a unit test where <head> already have meta[generator]. Maybe that's why coveralls decreased.
I'll add it.

Edit: added

decreased coverage may be due to shorter lines/functions.

SukkaW

LGTM

curbengh · 2019-08-18T06:45:12Z

squashed some commits.


        perf(meta_generator): drop cheerio (hexojs#3671)

* refactor(meta_generator): drop cheerio * fix(meta_generator): append to </title> * test(meta_generator): remove irrelevant head tag test * test(render): disable meta_generator * fix(meta_generator): do not append if there is existing tag, regardless the value of 'content' * test(open_generator): test existing generator tag * test(meta_generator): tag should be added only once Previous commit only works on post, not page This reverts commit 325f303.

curbengh added 7 commits Aug 11, 2019

refactor(meta_generator): drop cheerio

Verified

This commit was signed with a verified signature.

curbengh

GPG key ID: 21EA847C35D6E034 Learn about signing commits

cd0d378

fix(meta_generator): append to </title>

256f326

test(meta_generator): remove irrelevant head tag test

1ba5447

test(render): disable meta_generator

c401335

fix(meta_generator): do not append if there is existing tag,

c2bc3da

regardless the value of 'content'

test(open_generator): test existing generator tag

Loading status checks…

fb42a5b

test(meta_generator): tag should be added only once

dc708f3

Previous commit only works on post, not page This reverts commit 325f303.

curbengh reviewed Aug 16, 2019

View changes

lib/plugins/filter/meta_generator.js Outdated Show resolved Hide resolved

curbengh force-pushed the curbengh:metagen-cheerio branch from b5c3866 to 2a4fc33 Aug 16, 2019

curbengh reviewed Aug 16, 2019

View changes

lib/plugins/filter/meta_generator.js Outdated Show resolved Hide resolved

curbengh mentioned this pull request Aug 16, 2019

Performance Data of Hexo #3663

Closed

SukkaW added a commit to theme-suka/performance-test that referenced this pull request Aug 16, 2019

Add a test for hexo pull 3671

Loading status checks…

9e2da57

hexojs/hexo#3671

SukkaW reviewed Aug 16, 2019

View changes

curbengh dismissed SukkaW’s stale review via caa5aaa Aug 17, 2019

curbengh requested a review from SukkaW Aug 17, 2019

curbengh mentioned this pull request Aug 17, 2019

perf(meta_generator): re-implement as a helper #3669

Closed

1 of 2 tasks complete

curbengh added the #perfmatters label Aug 17, 2019

SukkaW reviewed Aug 17, 2019

View changes

curbengh dismissed SukkaW’s stale review via fb42a5b Aug 18, 2019

curbengh force-pushed the curbengh:metagen-cheerio branch from caa5aaa to fb42a5b Aug 18, 2019

SukkaW added this to the v4.0.0 milestone Aug 18, 2019

SukkaW self-requested a review Aug 18, 2019

SukkaW approved these changes Aug 18, 2019

View changes

curbengh mentioned this pull request Aug 18, 2019

Replace cheerio with native API #3677

Closed

4 of 4 tasks complete

curbengh changed the title ~~refactor(meta_generator): drop cheerio~~ perf(meta_generator): drop cheerio Aug 18, 2019

curbengh deleted the curbengh:metagen-cheerio branch Aug 21, 2019

SukkaW mentioned this pull request Aug 31, 2019

refactor(meta_generator): update regex and avoid edge case #3697

Merged

2 of 2 tasks complete

hexojs / hexo

perf(meta_generator): drop cheerio #3671

perf(meta_generator): drop cheerio #3671

curbengh commented Aug 16, 2019 •

edited

This comment has been minimized.

coveralls commented Aug 16, 2019 •

edited

This comment has been minimized.

stevenjoezhang commented Aug 16, 2019

This comment has been minimized.

curbengh commented Aug 16, 2019

This comment has been minimized.

curbengh commented Aug 17, 2019 •

edited

SukkaW left a comment

This comment has been minimized.

curbengh commented Aug 18, 2019

hexojs / hexo

Sponsor hexojs/hexo

Join GitHub today

perf(meta_generator): drop cheerio #3671

perf(meta_generator): drop cheerio #3671

Conversation

curbengh commented Aug 16, 2019 • edited

What does it do?

How to test

Pull request tasks

This comment has been minimized.

coveralls commented Aug 16, 2019 • edited

This comment has been minimized.

stevenjoezhang commented Aug 16, 2019

This comment has been minimized.

curbengh commented Aug 16, 2019

This comment has been minimized.

curbengh commented Aug 17, 2019 • edited

SukkaW left a comment

This comment has been minimized.

curbengh commented Aug 18, 2019

curbengh commented Aug 16, 2019 •

edited

coveralls commented Aug 16, 2019 •

edited

curbengh commented Aug 17, 2019 •

edited