chore: update vue core deps to 3.4

vuejs · Nov 28, 2023 · 349264b · 349264b
1 parent a03aae4
commit 349264b
Show file tree

Hide file tree

Showing 5 changed files with 231 additions and 208 deletions.
diff --git a/packages/language-core/package.json b/packages/language-core/package.json
@@ -15,7 +15,7 @@
 	"dependencies": {
 		"@volar/language-core": "~1.11.0",
 		"@volar/source-map": "~1.11.0",
-		"@vue/compiler-dom": "^3.3.0",
+		"@vue/compiler-dom": "^3.4.0-alpha.3",
 		"@vue/shared": "^3.3.0",
 		"computeds": "^0.0.1",
 		"minimatch": "^9.0.3",
@@ -27,7 +27,7 @@
 		"@types/minimatch": "^5.1.2",
 		"@types/node": "latest",
 		"@types/path-browserify": "^1.0.1",
-		"@vue/compiler-sfc": "^3.3.0"
+		"@vue/compiler-sfc": "^3.4.0-alpha.3"
 	},
 	"peerDependencies": {
 		"typescript": "*"

diff --git a/packages/language-core/src/plugins.ts b/packages/language-core/src/plugins.ts
@@ -36,7 +36,7 @@ export function getDefaultVueLanguagePlugins(
 			'@vue/compiler-dom': vueCompilerOptions.target < 3
 				? {
 					...CompilerDOM,
-					compile: CompilerVue2.compile,
+					compile: CompilerVue2.compile as typeof CompilerDOM.compile,
 				}
 				: CompilerDOM,
 			typescript: ts,

diff --git a/packages/language-core/src/utils/parseSfc.ts b/packages/language-core/src/utils/parseSfc.ts
@@ -6,11 +6,13 @@ export function parse(source: string): SFCParseResult {
 
 	const errors: CompilerError[] = [];
 	const ast = compiler.parse(source, {
+		parseMode: 'sfc',
 		// there are no components at SFC parsing level
 		isNativeTag: () => true,
 		// preserve all whitespaces
 		isPreTag: () => true,
-		getTextMode: ({ tag, props }, parent) => {
+		// @ts-ignore this has been removed in 3.4
+		getTextMode: ({ tag, props }: ElementNode, parent) => {
 			if (
 				(!parent && tag !== 'template')
 				|| (
@@ -24,10 +26,10 @@ export function parse(source: string): SFCParseResult {
 							p.value.content !== 'html'
 					)
 				)) {
-				return compiler.TextModes.RAWTEXT;
+				return 2 /* TextModes.RAWTEXT */;
 			}
 			else {
-				return compiler.TextModes.DATA;
+				return 0 /* TextModes.DATA */;
 			}
 		},
 		onError: e => {
@@ -53,8 +55,7 @@ export function parse(source: string): SFCParseResult {
 		}
 		switch (node.tag) {
 			case 'template':
-				const templateBlock = (descriptor.template = createBlock(node, source) as SFCTemplateBlock);
-				templateBlock.ast = node;
+				descriptor.template = createBlock(node, source) as SFCTemplateBlock;
 				break;
 			case 'script':
 				const scriptBlock = createBlock(node, source) as SFCScriptBlock;

diff --git a/packages/language-service/package.json b/packages/language-service/package.json
@@ -20,7 +20,7 @@
 		"@volar/language-core": "~1.11.0",
 		"@volar/language-service": "~1.11.0",
 		"@volar/typescript": "~1.11.0",
-		"@vue/compiler-dom": "^3.3.0",
+		"@vue/compiler-dom": "^3.4.0-alpha.3",
 		"@vue/language-core": "1.8.22",
 		"@vue/shared": "^3.3.0",
 		"computeds": "^0.0.1",