This repository has been archived by the owner on Apr 6, 2023. It is now read-only.
fix(schema): cleanup meta tags and deduplicate charset/viewport #6378
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
danielroe
added
bug
✅ Deploy Preview for nuxt3-docs canceled.
|
pi0
reviewed
Aug 5, 2022
packages/schema/src/config/_app.ts
Outdated
| viewport: 'width=device-width, initial-scale=1', | ||
| const resolved = defu(val, get('meta'), { | ||
| charset: val?.meta?.find(m => m.charset)?.charset ?? 'utf-8', | ||
| viewport: val?.meta?.find(m => m.name === 'viewport')?.content ?? 'width=device-width, initial-scale=1', |
There was a problem hiding this comment.
This logic could be simpler if we resolver after applying defu to conditionally set default viewport/charset.
There was a problem hiding this comment.
I guess I want to distinguish between which is source of truth. So if head.charset is resolved to utf-8 - was that because user set it or because that was the default value?
There was a problem hiding this comment.
Hmmm, we can add 3rd arg to defu too for real defaults. Not sure which syntax is more readable. One liner looks little bit unreadable. But we also have a find to filter below. It could be used to handle both filter and defaults for each.
pi0
reviewed
Aug 5, 2022
pi0
approved these changes
Aug 7, 2022
Merged
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
🔗 Linked issue
resolves nuxt/nuxt#14477, resolves nuxt/nuxt#13758
❓ Type of change
📚 Description
This sanitises user input for meta config, including preventing duplicate viewport + charsets (via meta and also top-level setting). It also removes a bit of code that was previously added for Bridge support, which didn't have access to schema.
📝 Checklist