types(compiler-sfc): type annotation tweaks + move @babel/types to devDeps

diff --git a/packages/compiler-sfc/package.json b/packages/compiler-sfc/package.json
index 1d48f0b1beb3fae1b615658208432914838be945..6986db5ab8570a76d4b6859101849172eb57de57 100644 (file)
--- a/packages/compiler-sfc/package.json
+++ b/packages/compiler-sfc/package.json
@@ -33,7 +33,6 @@
   "homepage": "https://github.com/vuejs/vue-next/tree/master/packages/compiler-sfc#readme",
   "dependencies": {
     "@babel/parser": "^7.15.0",
-    "@babel/types": "^7.15.0",
     "@types/estree": "^0.0.48",
     "@vue/compiler-core": "3.2.12",
     "@vue/compiler-dom": "3.2.12",
@@ -52,6 +51,7 @@
     "source-map": "^0.6.1"
   },
   "devDependencies": {
+    "@babel/types": "^7.15.0",
     "@types/consolidate": "^0.14.0",
     "@types/lru-cache": "^5.1.0",
     "pug": "^3.0.1",

diff --git a/packages/compiler-sfc/src/compileScript.ts b/packages/compiler-sfc/src/compileScript.ts
index 440c013d8640c40510e34f22cad3aaf15e759983..08eb55883959ef11f3bbc814c67551eabb441248 100644 (file)
--- a/packages/compiler-sfc/src/compileScript.ts
+++ b/packages/compiler-sfc/src/compileScript.ts
@@ -98,7 +98,7 @@ export interface SFCScriptCompileOptions {
   /**
    * Compile the template and inline the resulting render function
    * directly inside setup().
-   * - Only affects <script setup>
+   * - Only affects `<script setup>`
    * - This should only be used in production because it prevents the template
    * from being hot-reloaded separately from component state.
    */

diff --git a/packages/compiler-sfc/src/compileStyle.ts b/packages/compiler-sfc/src/compileStyle.ts
index 41280aa90473744ae580313c87a413191d19f38d..ce59bd5642a61a9065e7d4cc285e5dcd3d764cc8 100644 (file)
--- a/packages/compiler-sfc/src/compileStyle.ts
+++ b/packages/compiler-sfc/src/compileStyle.ts
@@ -30,7 +30,7 @@ export interface SFCStyleCompileOptions {
   postcssOptions?: any
   postcssPlugins?: any[]
   /**
-   * @deprecated
+   * @deprecated use `inMap` instead.
    */
   map?: RawSourceMap
 }

diff --git a/packages/compiler-sfc/src/parse.ts b/packages/compiler-sfc/src/parse.ts
index 83b5910b5775bff2e2ec8a2ae78bc00c5a652afb..5afdb47f6d5cf36596ba6be02a79c6ba3410c73d 100644 (file)
--- a/packages/compiler-sfc/src/parse.ts
+++ b/packages/compiler-sfc/src/parse.ts
@@ -9,7 +9,6 @@ import {
 import * as CompilerDOM from '@vue/compiler-dom'
 import { RawSourceMap, SourceMapGenerator } from 'source-map'
 import { TemplateCompiler } from './compileTemplate'
-import { Statement } from '@babel/types'
 import { parseCssVars } from './cssVars'
 import { createCache } from './cache'
 
@@ -41,8 +40,14 @@ export interface SFCScriptBlock extends SFCBlock {
   type: 'script'
   setup?: string | boolean
   bindings?: BindingMetadata
-  scriptAst?: Statement[]
-  scriptSetupAst?: Statement[]
+  /**
+   * import('\@babel/types').Statement
+   */
+  scriptAst?: any[]
+  /**
+   * import('\@babel/types').Statement
+   */
+  scriptSetupAst?: any[]
 }
 export interface SFCStyleBlock extends SFCBlock {
   type: 'style'