feat: disable features in Vue 3.3 (#326)

sxzz · web-flow · commit 5af1a50e9cee · 2023-03-30T19:37:20.000+08:00
diff --git a/docs/features/hoist-static.md b/docs/features/hoist-static.md
@@ -4,7 +4,7 @@
 
 With enabling `hoistStatic`, constants declared in macros of `<script setup>` can be referenced.
 
-If you support this feature, feel free to hit like :+1: or comment on the [Vue PR](https://github.com/vuejs/core/pull/5752). Thanks!
+For Vue >= 3.3, this feature will be turned off by default.
 
 | Features |     Supported      |
 | :------: | :----------------: |
diff --git a/docs/macros/define-options.md b/docs/macros/define-options.md
@@ -4,7 +4,7 @@
 
 Options API can be declared using the `defineOptions` in `<script setup>`, specifically to be able to set `name`, `props`, `emits`, and `render` inside of one function.
 
-If you support this feature, feel free to hit like :+1: or comment on the [RFC Discussion](https://github.com/vuejs/rfcs/discussions/430). Thanks!
+For Vue >= 3.3, this feature will be turned off by default.
 
 |  Features  |     Supported      |
 | :--------: | :----------------: |
diff --git a/docs/package.json b/docs/package.json
@@ -17,6 +17,6 @@
     "vite-plugin-pwa": "^0.14.6",
     "vitepress": "^1.0.0-alpha.63",
     "vitepress-plugin-search": "^1.0.4-alpha.19",
-    "vue": "^3.2.47"
+    "vue": "^3.3.0-alpha.6"
   }
 }
diff --git a/docs/zh-CN/features/hoist-static.md b/docs/zh-CN/features/hoist-static.md
@@ -6,7 +6,7 @@
 
 通过开启 `hoistStatic`, 可以在宏内部引用 `<script setup>` 中的变量
 
-如果你支持此功能，欢迎在 [Vue PR](https://github.com/vuejs/core/pull/5752) 中点赞 :+1: 或发表评论。
+在 Vue >= 3.3 中，此功能将默认关闭。
 
 |  特性  |        支持        |
 | :----: | :----------------: |
diff --git a/docs/zh-CN/macros/define-options.md b/docs/zh-CN/macros/define-options.md
@@ -4,7 +4,7 @@
 
 可以通过 `defineOptions` 宏在 `<script setup>` 中使用选项式 API，也就是说可以在一个宏函数中设置 `name`, `props`, `emits`, `render`。
 
-如果你支持此功能，欢迎在 [RFC](https://github.com/vuejs/rfcs/discussions/430) 中点赞 :+1: 或发表评论。
+在 Vue >= 3.3 中，此功能将默认关闭。
 
 |    特性    |        支持        |
 | :--------: | :----------------: |
diff --git a/package.json b/package.json
@@ -55,8 +55,8 @@
     "typescript": "^5.0.2",
     "vite": "^4.2.1",
     "vitest": "^0.29.7",
-    "vue": "^3.2.47",
-    "vue-tsc": "^1.2.0",
+    "vue": "^3.3.0-alpha.6",
+    "vue-tsc": "^1.3.8",
     "vue2": "npm:vue@^2.7.14",
     "webpack": "^5.76.3"
   },
@@ -70,6 +70,9 @@
         "@algolia/client-search",
         "@yarnpkg/core"
       ]
+    },
+    "overrides": {
+      "@volar/vue-language-core>@vue/compiler-dom": "^3.3.0-alpha.6"
     }
   }
 }
diff --git a/packages/common/package.json b/packages/common/package.json
@@ -53,7 +53,7 @@
   "dependencies": {
     "@babel/types": "^7.21.3",
     "@rollup/pluginutils": "^5.0.2",
-    "@vue/compiler-sfc": "^3.2.47",
+    "@vue/compiler-sfc": "^3.3.0-alpha.6",
     "local-pkg": "^0.4.3",
     "magic-string-ast": "^0.1.2"
   },
diff --git a/packages/common/src/dep.ts b/packages/common/src/dep.ts
@@ -1,9 +1,11 @@
 import { getPackageInfoSync } from 'local-pkg'
 
-export function detectVueVersion(root: string = process.cwd()): 2 | 3 {
+export function detectVueVersion(root: string = process.cwd()): number {
   const vuePkg = getPackageInfoSync('vue', { paths: [root] })
-  if (vuePkg) {
-    return +vuePkg.version.slice(0, 1) as 2 | 3
+  if (vuePkg && vuePkg.version) {
+    const versions = vuePkg.version.split('.')
+    const version = +versions.slice(0, 2).join('.')
+    return version >= 2 && version < 3 ? Math.trunc(version) : version
   } else {
     return 3
   }
diff --git a/packages/common/src/unplugin.ts b/packages/common/src/unplugin.ts
@@ -23,7 +23,7 @@ export function getTransformResult(
 export interface BaseOptions {
   include?: FilterPattern
   exclude?: FilterPattern
-  version?: 2 | 3
+  version?: number
 }
 
 export function createFilter(options: BaseOptions) {
diff --git a/packages/define-model/package.json b/packages/define-model/package.json
@@ -102,7 +102,7 @@
   "devDependencies": {
     "@vue-macros/api": "workspace:^",
     "@vueuse/core": "^9.13.0",
-    "vue": "^3.2.47"
+    "vue": "^3.3.0-alpha.6"
   },
   "engines": {
     "node": ">=14.19.0"
diff --git a/packages/define-model/src/core/index.ts b/packages/define-model/src/core/index.ts
@@ -32,7 +32,7 @@ import type {
 export function transformDefineModel(
   code: string,
   id: string,
-  version: 2 | 3,
+  version: number,
   unified: boolean
 ) {
   let hasDefineProps = false
diff --git a/packages/define-options/package.json b/packages/define-options/package.json
@@ -93,7 +93,7 @@
   },
   "devDependencies": {
     "rollup": "^3.20.2",
-    "vue": "^3.2.47"
+    "vue": "^3.3.0-alpha.6"
   },
   "engines": {
     "node": ">=14.19.0"
diff --git a/packages/define-props-refs/package.json b/packages/define-props-refs/package.json
@@ -93,7 +93,7 @@
     "unplugin": "^1.3.1"
   },
   "devDependencies": {
-    "vue": "^3.2.47"
+    "vue": "^3.3.0-alpha.6"
   },
   "engines": {
     "node": ">=14.19.0"
diff --git a/packages/define-props/package.json b/packages/define-props/package.json
@@ -95,7 +95,7 @@
   },
   "devDependencies": {
     "@vue-macros/reactivity-transform": "workspace:*",
-    "vue": "^3.2.47"
+    "vue": "^3.3.0-alpha.6"
   },
   "engines": {
     "node": ">=14.19.0"
diff --git a/packages/define-render/package.json b/packages/define-render/package.json
@@ -93,7 +93,7 @@
     "unplugin": "^1.3.1"
   },
   "devDependencies": {
-    "vue": "^3.2.47"
+    "vue": "^3.3.0-alpha.6"
   },
   "engines": {
     "node": ">=14.19.0"
diff --git a/packages/define-slots/package.json b/packages/define-slots/package.json
@@ -93,7 +93,7 @@
     "unplugin": "^1.3.1"
   },
   "devDependencies": {
-    "vue": "^3.2.47"
+    "vue": "^3.3.0-alpha.6"
   },
   "engines": {
     "node": ">=14.19.0"
diff --git a/packages/devtools/package.json b/packages/devtools/package.json
@@ -50,7 +50,7 @@
   },
   "dependencies": {
     "sirv": "^2.0.2",
-    "vue": "^3.2.47"
+    "vue": "^3.3.0-alpha.6"
   },
   "devDependencies": {
     "@unocss/reset": "^0.50.6",
diff --git a/packages/export-props/package.json b/packages/export-props/package.json
@@ -93,7 +93,7 @@
     "unplugin": "^1.3.1"
   },
   "devDependencies": {
-    "vue": "^3.2.47"
+    "vue": "^3.3.0-alpha.6"
   },
   "engines": {
     "node": ">=14.19.0"
diff --git a/packages/macros/package.json b/packages/macros/package.json
@@ -106,7 +106,7 @@
   },
   "devDependencies": {
     "esbuild": "^0.17.14",
-    "vue": "^3.2.47"
+    "vue": "^3.3.0-alpha.6"
   },
   "engines": {
     "node": ">=14.19.0"
diff --git a/packages/macros/src/index.ts b/packages/macros/src/index.ts
@@ -60,7 +60,7 @@ export type FeatureOptions = FeatureOptionsMap[FeatureName]
 
 export interface OptionsCommon {
   root?: string
-  version?: 2 | 3
+  version?: number
   isProduction?: boolean
   plugins?: {
     vue?: any
@@ -134,17 +134,23 @@ function resolveOptions({
       isProduction,
     }),
     defineModel: resolveSubOptions<'defineModel'>(defineModel, { version }),
-    defineOptions: resolveSubOptions<'defineOptions'>(defineOptions, {
-      version,
-    }),
+    defineOptions: resolveSubOptions<'defineOptions'>(
+      defineOptions,
+      { version },
+      version < 3.3
+    ),
     defineProps: resolveSubOptions<'defineProps'>(defineProps, { version }),
     definePropsRefs: resolveSubOptions<'definePropsRefs'>(definePropsRefs, {
       version,
     }),
     defineRender: resolveSubOptions<'defineRender'>(defineRender, { version }),
     defineSlots: resolveSubOptions<'defineSlots'>(defineSlots, { version }),
     exportProps: resolveSubOptions<'exportProps'>(exportProps, { version }),
-    hoistStatic: resolveSubOptions<'hoistStatic'>(hoistStatic, { version }),
+    hoistStatic: resolveSubOptions<'hoistStatic'>(
+      hoistStatic,
+      { version },
+      version < 3.3
+    ),
     namedTemplate: resolveSubOptions<'namedTemplate'>(namedTemplate, {
       version,
     }),
diff --git a/packages/macros/tests/__snapshots__/fixtures.test.ts.snap b/packages/macros/tests/__snapshots__/fixtures.test.ts.snap
@@ -89,7 +89,7 @@ const propName = 'title';
 const __default__ = defineComponent({
   name,
 });
-const _sfc_main = /*#__PURE__*/Object.assign(__default__, {
+const _sfc_main = Object.assign(__default__, {
   props: [propName],
   setup(__props) {
 
diff --git a/packages/named-template/package.json b/packages/named-template/package.json
@@ -86,11 +86,11 @@
   },
   "dependencies": {
     "@vue-macros/common": "workspace:~",
-    "@vue/compiler-dom": "^3.2.47",
+    "@vue/compiler-dom": "^3.3.0-alpha.6",
     "unplugin": "^1.3.1"
   },
   "devDependencies": {
-    "vue": "^3.2.47"
+    "vue": "^3.3.0-alpha.6"
   },
   "engines": {
     "node": ">=14.19.0"
diff --git a/packages/named-template/tests/__snapshots__/fixtures.test.ts.snap b/packages/named-template/tests/__snapshots__/fixtures.test.ts.snap
@@ -4,12 +4,12 @@ exports[`fixtures > tests/fixtures/basic.vue 1`] = `
 "import { defineComponent, createElementVNode, openBlock, createElementBlock, Fragment, toDisplayString, createTextVNode, createBlock } from 'vue';
 import _export_sfc from '/plugin-vue/export-helper';
 
+const foo$1 = \\"foo\\";
 var _sfc_main = /* @__PURE__ */ defineComponent({
   __name: \\"basic\\",
-  setup(__props, { expose }) {
-    expose();
-    const foo = \\"foo\\";
-    const __returned__ = { foo };
+  setup(__props, { expose: __expose }) {
+    __expose();
+    const __returned__ = { foo: foo$1 };
     Object.defineProperty(__returned__, \\"__isScriptSetup\\", { enumerable: false, value: true });
     return __returned__;
   }
@@ -20,7 +20,7 @@ const _hoisted_1$1 = /*#__PURE__*/createElementVNode(\\"div\\", null, \\"Test\\"
 function render$1(_ctx, _cache, $props, $setup, $data, $options) {
   return (openBlock(), createElementBlock(Fragment, null, [
     _hoisted_1$1,
-    createElementVNode(\\"span\\", null, toDisplayString($setup.foo))
+    createElementVNode(\\"span\\", null, toDisplayString(foo))
   ], 64 /* STABLE_FRAGMENT */))
 }
 
@@ -66,8 +66,8 @@ import _export_sfc from '/plugin-vue/export-helper';
 
 var _sfc_main = /* @__PURE__ */ defineComponent({
   __name: \\"dash-name\\",
-  setup(__props, { expose }) {
-    expose();
+  setup(__props, { expose: __expose }) {
+    __expose();
     const __returned__ = {};
     Object.defineProperty(__returned__, \\"__isScriptSetup\\", { enumerable: false, value: true });
     return __returned__;
@@ -109,12 +109,12 @@ exports[`fixtures > tests/fixtures/multi.vue 1`] = `
 "import { defineComponent, openBlock, createElementBlock, createTextVNode, createElementVNode, Fragment, createBlock, createCommentVNode } from 'vue';
 import _export_sfc from '/plugin-vue/export-helper';
 
+const pager$1 = \\"top\\";
 var _sfc_main = /* @__PURE__ */ defineComponent({
   __name: \\"multi\\",
-  setup(__props, { expose }) {
-    expose();
-    const pager = \\"top\\";
-    const __returned__ = { pager };
+  setup(__props, { expose: __expose }) {
+    __expose();
+    const __returned__ = { pager: pager$1 };
     Object.defineProperty(__returned__, \\"__isScriptSetup\\", { enumerable: false, value: true });
     return __returned__;
   }
@@ -144,9 +144,9 @@ function render(...args) {
     Fragment,
     null,
     [
-      $setup.pager === \\"top\\" ? (openBlock(), createBlock(Fragment, { key: 0 }, [block0.render(...args)])) : createCommentVNode(\\"v-if\\", true),
+      pager === \\"top\\" ? (openBlock(), createBlock(Fragment, { key: 0 }, [block0.render(...args)])) : createCommentVNode(\\"v-if\\", true),
       _hoisted_1,
-      $setup.pager === \\"bottom\\" ? (openBlock(), createBlock(Fragment, { key: 1 }, [block0.render(...args)])) : createCommentVNode(\\"v-if\\", true)
+      pager === \\"bottom\\" ? (openBlock(), createBlock(Fragment, { key: 1 }, [block0.render(...args)])) : createCommentVNode(\\"v-if\\", true)
     ],
     64
     /* STABLE_FRAGMENT */
diff --git a/packages/reactivity-transform/package.json b/packages/reactivity-transform/package.json
@@ -94,8 +94,8 @@
   "dependencies": {
     "@babel/parser": "^7.21.3",
     "@vue-macros/common": "workspace:~",
-    "@vue/compiler-core": "^3.2.47",
-    "@vue/shared": "^3.2.47",
+    "@vue/compiler-core": "^3.3.0-alpha.6",
+    "@vue/shared": "^3.3.0-alpha.6",
     "magic-string": "^0.30.0",
     "unplugin": "^1.3.1"
   },
diff --git a/packages/setup-block/package.json b/packages/setup-block/package.json
@@ -86,7 +86,7 @@
   },
   "dependencies": {
     "@vue-macros/common": "workspace:~",
-    "@vue/compiler-dom": "^3.2.47",
+    "@vue/compiler-dom": "^3.3.0-alpha.6",
     "unplugin": "^1.3.1"
   },
   "engines": {
diff --git a/packages/setup-component/package.json b/packages/setup-component/package.json
@@ -92,7 +92,7 @@
   },
   "devDependencies": {
     "rollup": "^3.20.2",
-    "vue": "^3.2.47"
+    "vue": "^3.3.0-alpha.6"
   },
   "engines": {
     "node": ">=14.19.0"
diff --git a/packages/setup-component/tests/__snapshots__/fixtures.test.ts.snap b/packages/setup-component/tests/__snapshots__/fixtures.test.ts.snap
diff --git a/packages/setup-sfc/package.json b/packages/setup-sfc/package.json
diff --git a/packages/setup-sfc/tests/__snapshots__/setup-sfc.test.ts.snap b/packages/setup-sfc/tests/__snapshots__/setup-sfc.test.ts.snap
diff --git a/packages/short-vmodel/package.json b/packages/short-vmodel/package.json
diff --git a/packages/single-define/package.json b/packages/single-define/package.json
diff --git a/packages/test-utils/package.json b/packages/test-utils/package.json
diff --git a/packages/volar/package.json b/packages/volar/package.json
diff --git a/playground/vue2/package.json b/playground/vue2/package.json
diff --git a/playground/vue3/package.json b/playground/vue3/package.json
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml

Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,6 @@`
`17`	`17`	`"vite-plugin-pwa": "^0.14.6",`
`18`	`18`	`"vitepress": "^1.0.0-alpha.63",`
`19`	`19`	`"vitepress-plugin-search": "^1.0.4-alpha.19",`
`20`		`- "vue": "^3.2.47"`
	`20`	`+ "vue": "^3.3.0-alpha.6"`
`21`	`21`	`}`
`22`	`22`	`}`
Original file line number	Diff line number	Diff line change
`@@ -55,8 +55,8 @@`
`55`	`55`	`"typescript": "^5.0.2",`
`56`	`56`	`"vite": "^4.2.1",`
`57`	`57`	`"vitest": "^0.29.7",`
`58`		`- "vue": "^3.2.47",`
`59`		`- "vue-tsc": "^1.2.0",`
	`58`	`+ "vue": "^3.3.0-alpha.6",`
	`59`	`+ "vue-tsc": "^1.3.8",`
`60`	`60`	`"vue2": "npm:vue@^2.7.14",`
`61`	`61`	`"webpack": "^5.76.3"`
`62`	`62`	`},`
`@@ -70,6 +70,9 @@`
`70`	`70`	`"@algolia/client-search",`
`71`	`71`	`"@yarnpkg/core"`
`72`	`72`	`]`
	`73`	`+ },`
	`74`	`+ "overrides": {`
	`75`	`+ "@volar/vue-language-core>@vue/compiler-dom": "^3.3.0-alpha.6"`
`73`	`76`	`}`
`74`	`77`	`}`
`75`	`78`	`}`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ export function getTransformResult(`
`23`	`23`	`export interface BaseOptions {`
`24`	`24`	`include?: FilterPattern`
`25`	`25`	`exclude?: FilterPattern`
`26`		`- version?: 2 \| 3`
	`26`	`+ version?: number`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`export function createFilter(options: BaseOptions) {`