parent
5e0e276609
commit
1f13e40316
3 changed files with 13 additions and 2 deletions
5
.changeset/calm-walls-unite.md
Normal file
5
.changeset/calm-walls-unite.md
Normal file
|
@ -0,0 +1,5 @@
|
|||
---
|
||||
'astro': patch
|
||||
---
|
||||
|
||||
Fix CSS scoping issue
|
|
@ -1,4 +1,4 @@
|
|||
import { Declaration, Plugin } from 'postcss';
|
||||
import { Plugin } from 'postcss';
|
||||
|
||||
interface AstroScopedOptions {
|
||||
className: string;
|
||||
|
@ -13,6 +13,11 @@ interface Selector {
|
|||
const CSS_SEPARATORS = new Set([' ', ',', '+', '>', '~']);
|
||||
const KEYFRAME_PERCENT = /\d+\.?\d*%/;
|
||||
|
||||
/** minify selector CSS */
|
||||
function minifySelector(selector: string): string {
|
||||
return selector.replace(/(\r?\n|\s)+/g, ' ').replace(/\s*(,|\+|>|~|\(|\))\s*/g, '$1');
|
||||
}
|
||||
|
||||
/** HTML tags that should never get scoped classes */
|
||||
export const NEVER_SCOPED_TAGS = new Set<string>(['base', 'body', 'font', 'frame', 'frameset', 'head', 'html', 'link', 'meta', 'noframes', 'noscript', 'script', 'style', 'title']);
|
||||
/**
|
||||
|
@ -101,7 +106,7 @@ export default function astroScopedStyles(options: AstroScopedOptions): Plugin {
|
|||
postcssPlugin: '@astrojs/postcss-scoped-styles',
|
||||
Rule(rule) {
|
||||
if (!rulesScopedCache.has(rule)) {
|
||||
rule.selector = scopeRule(rule.selector, options.className);
|
||||
rule.selector = scopeRule(minifySelector(rule.selector), options.className);
|
||||
rulesScopedCache.add(rule);
|
||||
}
|
||||
},
|
||||
|
|
|
@ -24,6 +24,7 @@ ScopedStyles('Scopes rules correctly', () => {
|
|||
'.class :global(ul li)': `.class.${className} ul li`, // allow doubly-scoped selectors
|
||||
'.class:not(.is-active)': `.class.${className}:not(.is-active)`, // Note: the :not() selector can NOT contain multiple classes, so this is correct; if this causes issues for some people then it‘s worth a discussion
|
||||
'body h1': `body h1.${className}`, // body shouldn‘t be scoped; it‘s not a component
|
||||
'html,body': `html,body`,
|
||||
from: 'from', // ignore keyframe keywords (below)
|
||||
to: 'to',
|
||||
'55%': '55%',
|
||||
|
|
Loading…
Reference in a new issue