Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(excerpt): stricter regex #4443

Merged
merged 1 commit into from Jul 25, 2020
Merged

fix(excerpt): stricter regex #4443

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/plugins/filter/after_post_render/excerpt.js
View file
Open in desktop
@@ -1,6 +1,6 @@
'use strict';

const rExcerpt = /<!--+\s*more\s*--+>/i;
const rExcerpt = /<!-- ?more ?-->/i;

function excerptFilter(data) {
const { content } = data;
Expand Down
36 changes: 7 additions & 29 deletions test/scripts/filters/excerpt.js
View file
Open in desktop
Expand Up @@ -23,36 +23,14 @@ describe('Excerpt', () => {
});

it('with <!-- more -->', () => {
const _moreCases = [
'<!-- more -->',
'<!-- more-->',
'<!--more -->',
'<!--more-->'
];

_moreCases().forEach(_test);

function _moreCases() {
const template = '<!--{{lead}}more{{tail}}-->';
// see: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/RegExp#Special_characters_meaning_in_regular_expressions
const spaces = ' \f\n\r\t\v\u00a0\u1680\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u2028\u2029\u202f\u205f\u3000\ufeff';
const cases = [];
let more, lead, tail, s, e;

for (let i = 0; i < spaces.length; ++i) {
lead = spaces[i];
for (let k = 0; k < spaces.length; ++k) {
tail = spaces[k];
s = '';
for (let m = 0; m < 3; ++m) {
e = '';
for (let n = 0; n < 3; ++n) {
more = template.replace('{{lead}}', s).replace('{{tail}}', e);
cases.push(more);
e += tail;
}

s += lead;
}
}
}

return cases;
}
_moreCases.forEach(moreCase => _test(moreCase));

function _test(more) {
const content = [
Expand Down