refactor(volar): replace @volar/vue-language-core with @vue/language-…

…core
vue-macros · Jul 9, 2023 · 4cd6d3a · 4cd6d3a
1 parent 2d1a0c4
commit 4cd6d3a
Show file tree

Hide file tree

Showing 13 changed files with 20 additions and 47 deletions.
diff --git a/.changeset/quiet-ligers-smoke.md b/.changeset/quiet-ligers-smoke.md
@@ -0,0 +1,5 @@
+---
+'@vue-macros/volar': minor
+---
+
+replace `@volar/vue-language-core` with `@vue/language-core`
diff --git a/packages/volar/package.json b/packages/volar/package.json
@@ -50,10 +50,10 @@
   "dependencies": {
     "@rollup/pluginutils": "^5.0.2",
     "@volar/language-core": "1.8.0",
-    "@volar/vue-language-core": "1.6.5",
     "@vue-macros/common": "workspace:*",
     "@vue-macros/define-props": "workspace:*",
-    "@vue-macros/short-vmodel": "workspace:*"
+    "@vue-macros/short-vmodel": "workspace:*",
+    "@vue/language-core": "1.8.4"
   },
   "devDependencies": {
     "@vue/compiler-dom": "^3.3.4",

diff --git a/packages/volar/src/common.ts b/packages/volar/src/common.ts
@@ -4,7 +4,7 @@ import {
   type VueCompilerOptions,
   type VueEmbeddedFile,
   replace,
-} from '@volar/vue-language-core'
+} from '@vue/language-core'
 import { type FileRangeCapabilities } from '@volar/language-core'
 import { type VolarOptions } from '..'
 

diff --git a/packages/volar/src/define-models.ts b/packages/volar/src/define-models.ts
@@ -4,7 +4,7 @@ import {
   type Segment,
   type Sfc,
   type VueLanguagePlugin,
-} from '@volar/vue-language-core'
+} from '@vue/language-core'
 import {
   addEmits,
   addProps,

diff --git a/packages/volar/src/define-options.ts b/packages/volar/src/define-options.ts
@@ -5,7 +5,7 @@ import {
   type Sfc,
   type VueLanguagePlugin,
   replace,
-} from '@volar/vue-language-core'
+} from '@vue/language-core'
 
 function transformDefineOptions({
   codes,

diff --git a/packages/volar/src/define-props-refs.ts b/packages/volar/src/define-props-refs.ts
@@ -1,5 +1,5 @@
 import { FileKind } from '@volar/language-core'
-import { type VueLanguagePlugin } from '@volar/vue-language-core'
+import { type VueLanguagePlugin } from '@vue/language-core'
 import { getImportNames, rewriteImports } from './common'
 
 const plugin: VueLanguagePlugin = ({

diff --git a/packages/volar/src/define-props.ts b/packages/volar/src/define-props.ts
@@ -1,4 +1,4 @@
-import { type VueLanguagePlugin } from '@volar/vue-language-core'
+import { type VueLanguagePlugin } from '@vue/language-core'
 
 const plugin: VueLanguagePlugin = ({ vueCompilerOptions }) => {
   vueCompilerOptions.macros.defineProps.push('$defineProps')

diff --git a/packages/volar/src/define-slots.ts b/packages/volar/src/define-slots.ts
@@ -7,7 +7,7 @@ import {
   type VueLanguagePlugin,
   replace,
   toString,
-} from '@volar/vue-language-core'
+} from '@vue/language-core'
 
 const transform = ({
   embeddedFile,

diff --git a/packages/volar/src/export-expose.ts b/packages/volar/src/export-expose.ts
@@ -7,7 +7,7 @@ import {
   type VueLanguagePlugin,
   replace,
   replaceSourceRange,
-} from '@volar/vue-language-core'
+} from '@vue/language-core'
 import { createFilter } from '@rollup/pluginutils'
 import { type VolarOptions } from '..'
 import { getVolarOptions } from './common'

diff --git a/packages/volar/src/export-props.ts b/packages/volar/src/export-props.ts
@@ -4,7 +4,7 @@ import {
   type VueEmbeddedFile,
   type VueLanguagePlugin,
   replaceSourceRange,
-} from '@volar/vue-language-core'
+} from '@vue/language-core'
 import { createFilter } from '@rollup/pluginutils'
 import { type VolarOptions } from '..'
 import { addProps, getVolarOptions, getVueLibraryName } from './common'

diff --git a/packages/volar/src/shim.d.ts b/packages/volar/src/shim.d.ts
@@ -1,4 +1,4 @@
-declare module '@volar/vue-language-core' {
+declare module '@vue/language-core' {
   export interface VueCompilerOptions {
     vueMacros?: import('..').VolarOptions
   }

diff --git a/packages/volar/src/short-vmodel.ts b/packages/volar/src/short-vmodel.ts
@@ -1,5 +1,5 @@
 import { transformShortVmodel } from '@vue-macros/short-vmodel'
-import { type VueLanguagePlugin } from '@volar/vue-language-core'
+import { type VueLanguagePlugin } from '@vue/language-core'
 import { getVolarOptions } from './common'
 
 const plugin: VueLanguagePlugin = ({ vueCompilerOptions }) => {

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml