@vue/typescript-plugin 2.1.2 → 2.1.5

package/index.js

@@ -1,13 +1,18 @@
 "use strict";
 const createLanguageServicePlugin_1 = require("@volar/typescript/lib/quickstart/createLanguageServicePlugin");
+const path = require("path");
 const vue = require("@vue/language-core");
 const common_1 = require("./lib/common");
 const server_1 = require("./lib/server");
 const windowsPathReg = /\\/g;
 const vueCompilerOptions = new WeakMap();
+const setupedProjects = new WeakSet();
 const basePlugin = (0, createLanguageServicePlugin_1.createLanguageServicePlugin)((ts, info) => {
     const vueOptions = getVueCompilerOptions();
-    const languagePlugin = vue.createVueLanguagePlugin(ts, info.languageServiceHost.getCompilationSettings(), vueOptions, id => id);
+    const languagePlugin = vue.createVueLanguagePlugin(ts, info.languageServiceHost.getCompilationSettings(), {
+        ...vueOptions,
+        __setupedGlobalTypes: () => setupedProjects.has(info.project),
+    }, id => id);
     vueCompilerOptions.set(info.project, vueOptions);
     return {
         languagePlugins: [languagePlugin],
@@ -44,11 +49,18 @@ const plugin = mods => {
             const options = vueCompilerOptions.get(proj);
             if (updateLevel >= 1 && options) {
                 try {
-                    const libDir = require.resolve(`${options.lib}/package.json`, { paths: [proj.getCurrentDirectory()] })
-                        .slice(0, -'package.json'.length);
-                    const globalTypesPath = `${libDir}dist/__globalTypes_${options.target}_${options.strictTemplates}.d.ts`;
-                    const globalTypesContents = vue.generateGlobalTypes(options.lib, options.target, options.strictTemplates);
+                    let dir = proj.getCurrentDirectory();
+                    while (!proj.directoryExists(path.resolve(dir, 'node_modules'))) {
+                        const parentDir = path.resolve(dir, '..');
+                        if (dir === parentDir) {
+                            throw 0;
+                        }
+                        dir = parentDir;
+                    }
+                    const globalTypesPath = path.resolve(dir, `node_modules/.vue-global-types/${options.lib}_${options.target}_${options.strictTemplates}.d.ts`);
+                    const globalTypesContents = vue.generateGlobalTypes('global', options.lib, options.target, options.strictTemplates);
                     proj.writeFile(globalTypesPath, globalTypesContents);
+                    setupedProjects.add(proj);
                 }
                 catch { }
             }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@vue/typescript-plugin",
-	"version": "2.1.2",
+	"version": "2.1.5",
 	"license": "MIT",
 	"files": [
 		"**/*.js",
@@ -13,11 +13,11 @@
 	},
 	"dependencies": {
 		"@volar/typescript": "~2.4.1",
-		"@vue/language-core": "2.1.2",
+		"@vue/language-core": "2.1.5",
 		"@vue/shared": "^3.4.0"
 	},
 	"devDependencies": {
 		"@types/node": "latest"
 	},
-	"gitHead": "4e4b839ea20ae11a2aef7ee9206465cb60a4be53"
+	"gitHead": "a95b51ac0b0db8825f77fbba37e29932b5be61e4"
 }