Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
128 changes: 128 additions & 0 deletions packages/compiler-sfc/__tests__/compileStyle.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,24 @@ color: red
}
}"
`)
expect(compileScoped(`:deep(.foo) { .bar { .baz { color: red; } } }`))
.toMatchInlineSnapshot(`
"[data-v-test] .foo {
.bar {
.baz { color: red;
}
}
}"
`)
expect(compileScoped(`.outer { :deep(.foo) { * .bar { color: red; } } }`))
.toMatchInlineSnapshot(`
".outer {
[data-v-test] .foo {
* .bar { color: red;
}
}
}"
`)
})

test('::v-slotted', () => {
Expand Down Expand Up @@ -397,6 +415,116 @@ color: red
).toHaveBeenWarned()
})
})

test('should keep leading universal selector before non-space combinator', () => {
expect(compileScoped(`* > .section { color: red; }`))
.toMatchInlineSnapshot(`
"* > .section[data-v-test] { color: red;
}"
`)
expect(compileScoped(`* + .section { color: red; }`))
.toMatchInlineSnapshot(`
"* + .section[data-v-test] { color: red;
}"
`)
expect(compileScoped(`* ~ .section { color: red; }`))
.toMatchInlineSnapshot(`
"* ~ .section[data-v-test] { color: red;
}"
`)
})

test('should keep leading universal selector in nested rules', () => {
expect(compileScoped(`* .section { color: red; }`)).toMatchInlineSnapshot(`
".section[data-v-test] { color: red;
}"
`)
expect(compileScoped(`.outer { * .section { color: red; } }`))
.toMatchInlineSnapshot(`
".outer {
* .section[data-v-test] { color: red;
}
}"
`)
expect(compileScoped(`.outer { * > .section { color: red; } }`))
.toMatchInlineSnapshot(`
".outer {
* > .section[data-v-test] { color: red;
}
}"
`)
expect(compileScoped(`.outer { *.foo { color: red; } }`))
.toMatchInlineSnapshot(`
".outer {
.foo[data-v-test] { color: red;
}
}"
`)
expect(compileScoped(`.outer { * { color: red; } }`))
.toMatchInlineSnapshot(`
".outer {
[data-v-test] { color: red;
}
}"
`)
expect(compileScoped(`@media screen { * .section { color: red; } }`))
.toMatchInlineSnapshot(`
"@media screen {
.section[data-v-test] { color: red;
}
}"
`)
expect(
compileScoped(`.outer { @media screen { * .section { color: red; } } }`),
).toMatchInlineSnapshot(`
".outer[data-v-test] {
@media screen {
* .section[data-v-test] { color: red;
}
}
}"
`)
})

test('should keep leading universal selector in :is() in nested rules', () => {
expect(compileScoped(`.outer { :is(* .foo) { color: red; } }`))
.toMatchInlineSnapshot(`
".outer {
:is(* .foo[data-v-test]) { color: red;
}
}"
`)
})

test('should keep leading universal selector in :where() in nested rules', () => {
expect(compileScoped(`.outer { :where(* .foo) { color: red; } }`))
.toMatchInlineSnapshot(`
".outer {
:where(* .foo[data-v-test]) { color: red;
}
}"
`)
})

test('should keep leading universal selector before non-space combinator in :is() in nested rules', () => {
expect(compileScoped(`.outer { :is(* > .foo) { color: red; } }`))
.toMatchInlineSnapshot(`
".outer {
:is(* > .foo[data-v-test]) { color: red;
}
}"
`)
})

test('should keep leading universal selector in ::v-slotted() in nested rules', () => {
expect(compileScoped(`.outer { ::v-slotted(* .foo) { color: red; } }`))
.toMatchInlineSnapshot(`
".outer {
* .foo[data-v-test-s] { color: red;
}
}"
`)
})
})

describe('SFC CSS modules', () => {
Expand Down
22 changes: 17 additions & 5 deletions packages/compiler-sfc/src/style/pluginScoped.ts
Original file line number Diff line number Diff line change
Expand Up @@ -76,17 +76,20 @@ function processRule(id: string, rule: Rule) {
}
processedRules.add(rule)
let deep = false
let isNested = false
let parent: Document | Container | undefined = rule.parent
while (parent && parent.type !== 'root') {
if ((parent as any).__deep) {
deep = true
break
}
if (parent.type === 'rule') {
isNested = true
}
parent = parent.parent
}
rule.selector = selectorParser(selectorRoot => {
selectorRoot.each(selector => {
rewriteSelector(id, rule, selector, selectorRoot, deep)
rewriteSelector(id, rule, selector, selectorRoot, deep, false, isNested)
})
}).processSync(rule.selector)
}
Expand All @@ -98,6 +101,7 @@ function rewriteSelector(
selectorRoot: selectorParser.Root,
deep: boolean,
slotted = false,
isNested = false,
Comment thread
coderabbitai[bot] marked this conversation as resolved.
) {
let node: selectorParser.Node | null = null
let shouldInject = !deep
Expand Down Expand Up @@ -170,6 +174,7 @@ function rewriteSelector(
selectorRoot,
deep,
true /* slotted */,
isNested,
)
let last: selectorParser.Selector['nodes'][0] = n
n.nodes[0].each(ss => {
Expand Down Expand Up @@ -199,9 +204,16 @@ function rewriteSelector(
if (!prev) {
// * .foo {} -> .foo[xxxxxxx] {}
if (next) {
if (next.type === 'combinator' && next.value === ' ') {
selector.removeChild(next)
if (next.type === 'combinator') {
if (next.value === ' ' && !isNested) {
// * .foo {} -> .foo[xxxxxxx] {}
selector.removeChild(next)
selector.removeChild(n)
}
// keep *: nested .outer { * .foo {} } or non-space combinator (* > .foo etc.)
return
Comment thread
coderabbitai[bot] marked this conversation as resolved.
}
// *.foo {} -> .foo[xxxxxxx] {}
selector.removeChild(n)
return
} else {
Expand Down Expand Up @@ -244,7 +256,7 @@ function rewriteSelector(
const { type, value } = node as selectorParser.Node
if (type === 'pseudo' && (value === ':is' || value === ':where')) {
;(node as selectorParser.Pseudo).nodes.forEach(value =>
rewriteSelector(id, rule, value, selectorRoot, deep, slotted),
rewriteSelector(id, rule, value, selectorRoot, deep, slotted, isNested),
)
shouldInject = false
}
Expand Down
Loading