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

perf(external_link): optimized regexp #4440

Merged
merged 1 commit into from
Jul 25, 2020
Merged

perf(external_link): optimized regexp #4440

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions lib/plugins/filter/after_post_render/external_link.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@

const { isExternalLink } = require('hexo-util');
let EXTERNAL_LINK_POST_ENABLED = true;
const rATag = /<a(?:\s+?|\s+?[^<>]+\s+?)?href=["']([^<>"']+)["'][^<>]*>/gi;
const rTargetAttr = /target=/i;
const rRelAttr = /rel=/i;
const rRelStrAttr = /rel=["']([^<>"']*)["']/i;
Comment on lines +5 to +8
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

  • Optimized rATag results in 20% less steps during regex matching
  • Cache regexp when hexo is loaded


function externalLinkFilter(data) {
if (!EXTERNAL_LINK_POST_ENABLED) return;
Expand All @@ -13,11 +17,11 @@ function externalLinkFilter(data) {
return;
}

data.content = data.content.replace(/<a(?:\s+?|\s+?[^<>]+)?href=["']([^<>"']+)["'][^<>]*>/gi, (str, href) => {
if (!isExternalLink(href, url, external_link.exclude) || /target=/i.test(str)) return str;
data.content = data.content.replace(rATag, (str, href) => {
if (!isExternalLink(href, url, external_link.exclude) || rTargetAttr.test(str)) return str;

if (/rel=/i.test(str)) {
str = str.replace(/rel=["']([^<>"']*)["']/i, (relStr, rel) => {
if (rRelAttr.test(str)) {
str = str.replace(rRelStrAttr, (relStr, rel) => {
return rel.includes('noopenner') ? relStr : `rel="${rel} noopener"`;
});
return str.replace('href=', 'target="_blank" href=');
Expand Down
12 changes: 8 additions & 4 deletions lib/plugins/filter/after_render/external_link.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@
const { isExternalLink } = require('hexo-util');

let EXTERNAL_LINK_SITE_ENABLED = true;
const rATag = /<a(?:\s+?|\s+?[^<>]+\s+?)?href=["']([^<>"']+)["'][^<>]*>/gi;
const rTargetAttr = /target=/i;
const rRelAttr = /rel=/i;
const rRelStrAttr = /rel=["']([^<>"']*)["']/i;

function externalLinkFilter(data) {
if (!EXTERNAL_LINK_SITE_ENABLED) return;
Expand All @@ -14,11 +18,11 @@ function externalLinkFilter(data) {
return;
}

return data.replace(/<a(?:\s+?|\s+?[^<>]+)?href=["']([^<>"']+)["'][^<>]*>/gi, (str, href) => {
if (!isExternalLink(href, url, external_link.exclude) || /target=/i.test(str)) return str;
return data.replace(rATag, (str, href) => {
if (!isExternalLink(href, url, external_link.exclude) || rTargetAttr.test(str)) return str;

if (/rel=/i.test(str)) {
str = str.replace(/rel=["']([^<>"']*)["']/i, (relStr, rel) => {
if (rRelAttr.test(str)) {
str = str.replace(rRelStrAttr, (relStr, rel) => {
return rel.includes('noopenner') ? relStr : `rel="${rel} noopener"`;
});
return str.replace('href=', 'target="_blank" href=');
Expand Down
2 changes: 1 addition & 1 deletion lib/plugins/filter/after_render/meta_generator.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ function hexoMetaGeneratorInject(data) {
if (!NEED_INJECT) return;

if (!this.config.meta_generator
|| data.match(/<meta\s+(?:[^<>]+\s)?name=['|"]?generator['|"]?/i)) {
|| data.match(/<meta\s+(?:[^<>/]+\s)?name=['"]generator['"]/i)) {
NEED_INJECT = false;
return;
}
Expand Down