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

fix: support stylesheets with link tag and media/disable prop #6751

Merged
merged 5 commits into from
Jul 25, 2022
Merged

fix: support stylesheets with link tag and media/disable prop #6751

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
bae30d7
fix: link tag with media prop
pd4d10 Feb 4, 2022
10c4a5b
Update packages/vite/src/node/plugins/html.ts
pd4d10 Feb 4, 2022
a9ec78a
fixup
pd4d10 Feb 4, 2022
d340735
chore: merge main
bluwy Jul 21, 2022
d4711d1
chore: add tests
bluwy Jul 21, 2022
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
8 changes: 7 additions & 1 deletion packages/vite/src/node/plugins/html.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -322,7 +322,13 @@ export function buildHtmlPlugin(config: ResolvedConfig): Plugin {
// assetsUrl may be encodeURI
const url = decodeURI(p.value.content)
if (!isExcludedUrl(url)) {
if (node.tag === 'link' && isCSSRequest(url)) {
if (
node.tag === 'link' &&
isCSSRequest(url) &&
// should not be converted if media attribute is present
// see #6748
!node.props.some((p) => p.name === 'media')
) {
// CSS references, convert to import
js += `\nimport ${JSON.stringify(url)}`
shouldRemove = true
Expand Down