chore: fix rebase merging from master branch

vuejs · Dec 21, 2023 · a3b942a · a3b942a
1 parent ea1fdf5
commit a3b942a
Show file tree

Hide file tree

Showing 8 changed files with 258 additions and 233 deletions.
diff --git a/extensions/vscode/package.json b/extensions/vscode/package.json
@@ -659,14 +659,14 @@
 	"devDependencies": {
 		"@types/semver": "^7.5.3",
 		"@types/vscode": "^1.82.0",
-		"@volar/vscode": "2.0.0-alpha.0",
+		"@volar/vscode": "2.0.0-alpha.10",
 		"@vue/language-core": "1.8.26",
 		"@vue/language-server": "1.8.26",
 		"esbuild": "latest",
 		"esbuild-plugin-copy": "latest",
 		"esbuild-visualizer": "latest",
 		"semver": "^7.5.4",
-		"typescript-vue-plugin": "1.8.25",
+		"typescript-vue-plugin": "1.8.26",
 		"vsce": "latest",
 		"vscode-languageclient": "^9.0.1"
 	}

diff --git a/packages/component-meta/package.json b/packages/component-meta/package.json
@@ -13,7 +13,7 @@
 		"directory": "packages/component-meta"
 	},
 	"dependencies": {
-		"@volar/typescript": "2.0.0-alpha.0",
+		"@volar/typescript": "2.0.0-alpha.10",
 		"@vue/language-core": "1.8.26",
 		"path-browserify": "^1.0.1",
 		"vue-component-type-helpers": "1.8.26"

diff --git a/packages/language-server/package.json b/packages/language-server/package.json
@@ -16,9 +16,9 @@
 		"directory": "packages/language-server"
 	},
 	"dependencies": {
-		"@volar/language-core": "2.0.0-alpha.0",
-		"@volar/language-server": "2.0.0-alpha.0",
-		"@volar/typescript": "2.0.0-alpha.0",
+		"@volar/language-core": "2.0.0-alpha.10",
+		"@volar/language-server": "2.0.0-alpha.10",
+		"@volar/typescript": "2.0.0-alpha.10",
 		"@vue/language-core": "1.8.26",
 		"@vue/language-service": "1.8.26",
 		"vscode-languageserver-protocol": "^3.17.5",

diff --git a/packages/tsc/package.json b/packages/tsc/package.json
@@ -17,7 +17,7 @@
 		"vue-tsc": "./bin/vue-tsc.js"
 	},
 	"dependencies": {
-		"@volar/typescript": "2.0.0-alpha.0",
+		"@volar/typescript": "2.0.0-alpha.10",
 		"@vue/language-core": "1.8.26",
 		"semver": "^7.5.4"
 	},

diff --git a/packages/tsc/tests/__snapshots__/dts.spec.ts.snap b/packages/tsc/tests/__snapshots__/dts.spec.ts.snap
@@ -33,7 +33,11 @@ exports[`vue-tsc-dts > Input: generic/component.vue, Output: generic/component.v
         default?(data: {
             foo: number;
         }): any;
-    }>;
+    }> & {
+        default?(data: {
+            foo: number;
+        }): any;
+    };
 }, __VLS_expose?: (exposed: import("vue").ShallowUnwrapRef<{
     baz: number;
 }>) => void, __VLS_setup?: Promise<{
@@ -49,7 +53,11 @@ exports[`vue-tsc-dts > Input: generic/component.vue, Output: generic/component.v
         default?(data: {
             foo: number;
         }): any;
-    }>;
+    }> & {
+        default?(data: {
+            foo: number;
+        }): any;
+    };
     emit: (e: 'bar', data: number) => void;
 }>) => import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
     [key: string]: any;
@@ -67,7 +75,11 @@ exports[`vue-tsc-dts > Input: generic/component.vue, Output: generic/component.v
             default?(data: {
                 foo: number;
             }): any;
-        }>;
+        }> & {
+            default?(data: {
+                foo: number;
+            }): any;
+        };
         emit: (e: 'bar', data: number) => void;
     };
 };

diff --git a/packages/typescript-plugin/package.json b/packages/typescript-plugin/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "typescript-vue-plugin",
-	"version": "1.8.25",
+	"version": "1.8.26",
 	"main": "out/index.js",
 	"license": "MIT",
 	"files": [
@@ -14,6 +14,6 @@
 	},
 	"dependencies": {
 		"@volar/typescript": "2.0.0-alpha.10",
-		"@vue/language-core": "1.8.25"
+		"@vue/language-core": "1.8.26"
 	}
 }