feat!: use VTI in vls build mode

BREAKING CHANGE: use VTI in vls build mode. `vti` is required as a peerDependency if `vls` is enabled.
fi3ework · Aug 26, 2022 · c017c65 · c017c65
1 parent 810c173
commit c017c65
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 78 deletions.
diff --git a/packages/vite-plugin-checker/bin/vls.js b/packages/vite-plugin-checker/bin/vls.js
diff --git a/packages/vite-plugin-checker/package.json b/packages/vite-plugin-checker/package.json
@@ -4,9 +4,6 @@
   "description": "Vite plugin that runs TypeScript type checker on a separate process.",
   "main": "lib/main.js",
   "type": "module",
-  "bin": {
-    "vite-plugin-checker-vls": "./bin/vls.js"
-  },
   "types": "lib/main.d.ts",
   "files": [
     "lib",
@@ -51,10 +48,10 @@
     "vscode-uri": "^3.0.2"
   },
   "peerDependencies": {
-    "vite": "^2.0.0 || ^3.0.0-0",
     "eslint": ">=7",
-    "vls": "*",
-    "typescript": "*"
+    "typescript": "*",
+    "vite": "^2.0.0 || ^3.0.0-0",
+    "vls": "*"
   },
   "peerDependenciesMeta": {
     "eslint": {
@@ -65,6 +62,9 @@
     },
     "vls": {
       "optional": true
+    },
+    "vti": {
+      "optional": true
     }
   },
   "devDependencies": {
@@ -78,6 +78,7 @@
     "tsup": "^5.12.3",
     "typescript": "~4.5.5",
     "vls": "^0.7.6",
+    "vti": "^0.1.7",
     "vue-tsc": "0.38.9"
   }
 }
diff --git a/packages/vite-plugin-checker/src/checkers/vls/cli.ts b/packages/vite-plugin-checker/src/checkers/vls/cli.ts
diff --git a/packages/vite-plugin-checker/src/checkers/vls/main.ts b/packages/vite-plugin-checker/src/checkers/vls/main.ts
@@ -75,17 +75,16 @@ export class VlsChecker extends Checker<'vls'> {
         buildBin: (config) => {
           if (typeof config.vls === 'object') {
             return [
-              'vite-plugin-checker-vls',
+              'vti',
               [
                 'diagnostics',
-                '--checker-config',
                 // Escape quotes so that the system shell doesn't strip them out:
                 '"' + JSON.stringify(config.vls).replace(/[\\"]/g, '\\$&') + '"',
               ],
             ]
           }
 
-          return ['vite-plugin-checker-vls', ['diagnostics']]
+          return ['vti', ['diagnostics']]
         },
       },
       createDiagnostic,
@@ -94,7 +93,6 @@ export class VlsChecker extends Checker<'vls'> {
 
   public init() {
     const _createServeAndBuild = super.initMainThread()
-    // module.exports.createServeAndBuild = createServeAndBuild
     createServeAndBuild = _createServeAndBuild
     super.initWorkerThread()
   }

diff --git a/playground/vls-vue2/__tests__/test.spec.ts b/playground/vls-vue2/__tests__/test.spec.ts
@@ -33,7 +33,6 @@ describe('vue2-vls', () => {
 
   describe.runIf(isBuild)('build', () => {
     it('enableBuild: true', async () => {
-      console.log('👰', log)
       expectStderrContains(log, `Property 'msg1' does not exist on type`)
     })
   })

diff --git a/playground/vls-vue2/package.json b/playground/vls-vue2/package.json
@@ -26,12 +26,13 @@
     "eslint-plugin-vue": "^7.6.0",
     "prettier": "2.6.0",
     "sass": "^1.32.7",
+    "typescript": "~4.3.2",
     "vite": "^3.0.4",
+    "vite-plugin-checker": "workspace:*",
     "vite-plugin-components": "^0.12.2",
     "vite-plugin-vue2": "^1.9.0",
-    "typescript": "~4.3.2",
-    "vite-plugin-checker": "workspace:*",
     "vls": "^0.8.1",
+    "vti": "^0.1.7",
     "vue-template-compiler": "^2.6.14"
   }
 }
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml