From: underfin <2218301630@qq.com>
Date: Mon, 20 Jul 2020 16:46:33 +0000 (+0800)
Subject: fix(compiler-sfc): use correct importer with `useCssVars` (#1658)
X-Git-Tag: v3.0.0-rc.3~17
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6f148d0b9a0630dc87c741ed951c82b639e776b2;p=thirdparty%2Fvuejs%2Fcore.git

fix(compiler-sfc): use correct importer with `useCssVars` (#1658)

fix #https://github.com/vitejs/vite/issues/578
---

diff --git a/packages/compiler-sfc/__tests__/__snapshots__/compileScript.spec.ts.snap b/packages/compiler-sfc/__tests__/__snapshots__/compileScript.spec.ts.snap
index dd3c2472cf..59428dea71 100644
--- a/packages/compiler-sfc/__tests__/__snapshots__/compileScript.spec.ts.snap
+++ b/packages/compiler-sfc/__tests__/__snapshots__/compileScript.spec.ts.snap
@@ -107,7 +107,7 @@ export default __define__({
 
 exports[`SFC compile <script setup> CSS vars injection <script> w/ default export 1`] = `
 "const __default__ = { setup() {} }
-import { useCSSVars as __useCSSVars__ } from 'vue'
+import { useCssVars as __useCssVars__ } from 'vue'
 const __injectCSSVars__ = () => {
 __useCssVars__(_ctx => ({ color: _ctx.color }))
 }
@@ -123,7 +123,7 @@ exports[`SFC compile <script setup> CSS vars injection <script> w/ default expor
           // export default {}
           const __default__ = {}
         
-import { useCSSVars as __useCSSVars__ } from 'vue'
+import { useCssVars as __useCssVars__ } from 'vue'
 const __injectCSSVars__ = () => {
 __useCssVars__(_ctx => ({ color: _ctx.color }))
 }
@@ -137,7 +137,7 @@ export default __default__"
 exports[`SFC compile <script setup> CSS vars injection <script> w/ no default export 1`] = `
 "const a = 1
 const __default__ = {}
-import { useCSSVars as __useCSSVars__ } from 'vue'
+import { useCssVars as __useCssVars__ } from 'vue'
 const __injectCSSVars__ = () => {
 __useCssVars__(_ctx => ({ color: _ctx.color }))
 }
diff --git a/packages/compiler-sfc/src/compileScript.ts b/packages/compiler-sfc/src/compileScript.ts
index db98697242..05c8de4ff8 100644
--- a/packages/compiler-sfc/src/compileScript.ts
+++ b/packages/compiler-sfc/src/compileScript.ts
@@ -555,7 +555,7 @@ export function compileScript(
     returned = `Object.assign(\n  ${returned}\n)`
   }
 
-  // inject `useCSSVars` calls
+  // inject `useCssVars` calls
   if (hasCssVars) {
     s.prepend(`import { useCssVars as __useCssVars__ } from 'vue'\n`)
     for (const style of styles) {
diff --git a/packages/compiler-sfc/src/genCssVars.ts b/packages/compiler-sfc/src/genCssVars.ts
index 45139a4bcc..a53608890a 100644
--- a/packages/compiler-sfc/src/genCssVars.ts
+++ b/packages/compiler-sfc/src/genCssVars.ts
@@ -65,7 +65,7 @@ export function injectCssVarsCalls(
 
   return (
     script +
-    `\nimport { useCSSVars as __useCSSVars__ } from 'vue'\n` +
+    `\nimport { useCssVars as __useCssVars__ } from 'vue'\n` +
     `const __injectCSSVars__ = () => {\n${calls}}\n` +
     `const __setup__ = __default__.setup\n` +
     `__default__.setup = __setup__\n` +