@vue/language-core 2.0.22 → 2.0.23-alpha.0

package/index.d.ts

@@ -1,3 +1,4 @@
+import type { VueCompilerOptions } from './lib/types';
 export * from './lib/codegen/template';
 export * from './lib/languageModule';
 export * from './lib/parsers/scriptSetupRanges';
@@ -11,3 +12,10 @@ export * from './lib/utils/shared';
 export { tsCodegen } from './lib/plugins/vue-tsx';
 export * from '@volar/language-core';
 export type * as CompilerDOM from '@vue/compiler-dom';
+declare module '@volar/language-core' {
+    interface Language {
+        vue?: {
+            compilerOptions: VueCompilerOptions;
+        };
+    }
+}

package/lib/languageModule.js

@@ -136,7 +136,7 @@ function createVueLanguagePlugin(ts, asFileName, getProjectVersion, isRootFile,
             })),
             getServiceScript(root) {
                 for (const code of (0, language_core_1.forEachEmbeddedCode)(root)) {
-                    if (code.id.startsWith('script_')) {
+                    if (/script_(js|jsx|ts|tsx)/.test(code.id)) {
                         const lang = code.id.substring('script_'.length);
                         return {
                             code,

package/lib/plugins/vue-sfc-scripts.js

@@ -6,16 +6,16 @@ const plugin = () => {
         getEmbeddedCodes(_fileName, sfc) {
             const names = [];
             if (sfc.script) {
-                names.push({ id: 'scriptFormat', lang: sfc.script.lang });
+                names.push({ id: 'script_raw', lang: sfc.script.lang });
             }
             if (sfc.scriptSetup) {
-                names.push({ id: 'scriptSetupFormat', lang: sfc.scriptSetup.lang });
+                names.push({ id: 'scriptsetup_raw', lang: sfc.scriptSetup.lang });
             }
             return names;
         },
         resolveEmbeddedCode(_fileName, sfc, embeddedFile) {
-            const script = embeddedFile.id === 'scriptFormat' ? sfc.script
-                : embeddedFile.id === 'scriptSetupFormat' ? sfc.scriptSetup
+            const script = embeddedFile.id === 'script_raw' ? sfc.script
+                : embeddedFile.id === 'scriptsetup_raw' ? sfc.scriptSetup
                     : undefined;
             if (script) {
                 embeddedFile.content.push([

package/lib/plugins/vue-tsx.js

@@ -25,7 +25,7 @@ const plugin = ctx => {
         },
         resolveEmbeddedCode(fileName, sfc, embeddedFile) {
             const _tsx = useTsx(fileName, sfc);
-            if (embeddedFile.id.startsWith('script_')) {
+            if (/script_(js|jsx|ts|tsx)/.test(embeddedFile.id)) {
                 const tsx = _tsx.generatedScript();
                 if (tsx) {
                     const content = [...tsx.codes];

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@vue/language-core",
-	"version": "2.0.22",
+	"version": "2.0.23-alpha.0",
 	"license": "MIT",
 	"files": [
 		"**/*.js",
@@ -12,7 +12,7 @@
 		"directory": "packages/language-core"
 	},
 	"dependencies": {
-		"@volar/language-core": "~2.3.1",
+		"@volar/language-core": "~2.4.0-alpha.0",
 		"@vue/compiler-dom": "^3.4.0",
 		"@vue/shared": "^3.4.0",
 		"computeds": "^0.0.1",
@@ -25,6 +25,7 @@
 		"@types/minimatch": "^5.1.2",
 		"@types/node": "latest",
 		"@types/path-browserify": "^1.0.1",
+		"@volar/typescript": "~2.4.0-alpha.0",
 		"@vue/compiler-sfc": "^3.4.0"
 	},
 	"peerDependencies": {
@@ -35,5 +36,5 @@
 			"optional": true
 		}
 	},
-	"gitHead": "884c8a553d4fd240167fcb97c6a738564f9d697a"
+	"gitHead": "c1b2f64df85617643c1b4b408d99447df3fa2d5f"
 }