From: Evan You <yyx990803@gmail.com>
Date: Fri, 10 Jul 2020 20:47:36 +0000 (-0400)
Subject: feat(compiler-sfc): allow using :deep, :global & :slotted for short in `<style scoped>`
X-Git-Tag: v3.0.0-beta.21~27
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f3cc41f0c8713475f2aa592bae3d82ffbc6b1300;p=thirdparty%2Fvuejs%2Fcore.git

feat(compiler-sfc): allow using :deep, :global & :slotted for short in `<style scoped>`
---

diff --git a/packages/compiler-sfc/__tests__/compileStyle.spec.ts b/packages/compiler-sfc/__tests__/compileStyle.spec.ts
index 628eaffddc..b1bd2ee012 100644
--- a/packages/compiler-sfc/__tests__/compileStyle.spec.ts
+++ b/packages/compiler-sfc/__tests__/compileStyle.spec.ts
@@ -60,6 +60,10 @@ describe('SFC scoped CSS', () => {
   })
 
   test('::v-deep', () => {
+    expect(compileScoped(`:deep(.foo) { color: red; }`)).toMatchInlineSnapshot(`
+      "[test] .foo { color: red;
+      }"
+    `)
     expect(compileScoped(`::v-deep(.foo) { color: red; }`))
       .toMatchInlineSnapshot(`
       "[test] .foo { color: red;
@@ -78,6 +82,11 @@ describe('SFC scoped CSS', () => {
   })
 
   test('::v-slotted', () => {
+    expect(compileScoped(`:slotted(.foo) { color: red; }`))
+      .toMatchInlineSnapshot(`
+    ".foo[test-s] { color: red;
+    }"
+  `)
     expect(compileScoped(`::v-slotted(.foo) { color: red; }`))
       .toMatchInlineSnapshot(`
       ".foo[test-s] { color: red;
@@ -96,6 +105,11 @@ describe('SFC scoped CSS', () => {
   })
 
   test('::v-global', () => {
+    expect(compileScoped(`:global(.foo) { color: red; }`))
+      .toMatchInlineSnapshot(`
+    ".foo { color: red;
+    }"
+  `)
     expect(compileScoped(`::v-global(.foo) { color: red; }`))
       .toMatchInlineSnapshot(`
       ".foo { color: red;
diff --git a/packages/compiler-sfc/src/stylePluginScoped.ts b/packages/compiler-sfc/src/stylePluginScoped.ts
index f9c1d7799d..ef4664fd7b 100644
--- a/packages/compiler-sfc/src/stylePluginScoped.ts
+++ b/packages/compiler-sfc/src/stylePluginScoped.ts
@@ -44,9 +44,10 @@ export default postcss.plugin('vue-scoped', (options: any) => (root: Root) => {
           }
 
           if (n.type === 'pseudo') {
+            const { value } = n
             // deep: inject [id] attribute at the node before the ::v-deep
             // combinator.
-            if (n.value === '::v-deep') {
+            if (value === ':deep' || value === '::v-deep') {
               if (n.nodes.length) {
                 // .foo ::v-deep(.bar) -> .foo[xxxxxxx] .bar
                 // replace the current node with ::v-deep's inner selector
@@ -81,7 +82,7 @@ export default postcss.plugin('vue-scoped', (options: any) => (root: Root) => {
             // slot: use selector inside `::v-slotted` and inject [id + '-s']
             // instead.
             // ::v-slotted(.foo) -> .foo[xxxxxxx-s]
-            if (n.value === '::v-slotted') {
+            if (value === ':slotted' || value === '::v-slotted') {
               rewriteSelector(n.nodes[0] as Selector, true /* slotted */)
               selector.insertAfter(n, n.nodes[0])
               selector.removeChild(n)
@@ -93,7 +94,7 @@ export default postcss.plugin('vue-scoped', (options: any) => (root: Root) => {
 
             // global: replace with inner selector and do not inject [id].
             // ::v-global(.foo) -> .foo
-            if (n.value === '::v-global') {
+            if (value === ':global' || n.value === '::v-global') {
               selectors.insertAfter(selector, n.nodes[0])
               selectors.removeChild(selector)
               return false