feat: add prop to helper extension #4070
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 tasks
SukkaW
commented
Jan 10, 2020
| || data.match(/<meta([\s]+|[\s]+[^<>]+[\s]+)name=['|"]?generator['|"]?/i)) return; | ||
| const { config, version } = this; | ||
|
|
||
| const needInject = cache.apply('need-inject', () => { |
There was a problem hiding this comment.
I just assume meta[name="generator"] will be inserted to every page if meta_generator() is used or <meta name="generator" content="Hexo [version]"> is manually added in the theme. So it is fine to cache this.
curbengh
reviewed
Jan 11, 2020
curbengh
reviewed
Jan 11, 2020
curbengh
requested changes
Jan 11, 2020
curbengh
reviewed
Jan 13, 2020
2 tasks
| @@ -1,13 +1,24 @@ | |||
| 'use strict'; | |||
|
|
|||
| const { Cache } = require('hexo-util'); | |||
| const cache = new Cache(); | |||
There was a problem hiding this comment.
Using local val is enough.
let needInject;
...
function hexoMetaGeneratorInject(data) {
const { config } = this;
if (typeof needInject !== 'boolean') {
needInject = !(!config.meta_generator
|| this.extend.helper.getProp('meta_generator')
|| data.match(/<meta([\s]+|[\s]+[^<>]+[\s]+)name=['|"]?generator['|"]?/i));
}There was a problem hiding this comment.
IMHO, use cache.apply here made code more readable since cache.apply support caching return value of given function.
lib/plugins/helper/meta_generator.js
Outdated
| module.exports = metaGeneratorHelper; | ||
| module.exports = ctx => { | ||
| return () => { | ||
| if (!ctx.extend.helper.getProp('meta_generator')) ctx.extend.helper.setProp('meta_generator', true); |
There was a problem hiding this comment.
Suggest use_meta_generator_helper as the property name.
If meta_generator is used, we don't know what this means.
There was a problem hiding this comment.
Change to meta_generator_helper_used
SukkaW
force-pushed
the
extend-helper-prop
branch
from
1df1d89
to
7eede38
Compare
2 tasks
2 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What does it do?
Fix #4056. Close #3919.
Automatically disable
meta_generatorfilter ifmeta_generator()is used.cc @curbengh @jiangtj
How to test
Screenshots
Pull request tasks