fix(vue-tsc): runtime error UI

fi3ework · Mar 24, 2022 · 6c561e8 · 6c561e8
1 parent ad0803a
commit 6c561e8
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 36 deletions.
diff --git a/packages/vite-plugin-checker/src/checkers/vueTsc/main.ts b/packages/vite-plugin-checker/src/checkers/vueTsc/main.ts
@@ -10,7 +10,7 @@ import {
   diagnosticToRuntimeError,
   diagnosticToTerminalLog,
   ensureCall,
-  normalizeTsDiagnostic,
+  normalizeVueTscDiagnostic,
   toViteCustomPayload,
   wrapCheckerSummary,
 } from '../../logger'
@@ -28,10 +28,9 @@ const createDiagnostic: CreateDiagnostic<'vueTsc'> = (pluginConfig) => {
       terminal = enableTerminal
     },
     configureServer({ root }) {
-      invariant(pluginConfig.vueTsc, 'config.typescript should be `false`')
+      invariant(pluginConfig.vueTsc, 'config.vueTsc should be `false`')
 
       const { tsDirTo } = prepareVueTsc()
-      // const tsDirTo = path.resolve(__dirname, 'typescript-vue-tsc')
 
       const vueTs = require(path.resolve(tsDirTo, 'lib/tsc.js'))
 
@@ -61,13 +60,13 @@ const createDiagnostic: CreateDiagnostic<'vueTsc'> = (pluginConfig) => {
 
       // https://github.com/microsoft/TypeScript/blob/a545ab1ac2cb24ff3b1aaf0bfbfb62c499742ac2/src/compiler/watch.ts#L12-L28
       const reportDiagnostic = (diagnostic: ts.Diagnostic) => {
-        const normalizedDiagnostic = normalizeTsDiagnostic(diagnostic)
+        const normalizedDiagnostic = normalizeVueTscDiagnostic(diagnostic)
         if (normalizedDiagnostic === null) {
           return
         }
 
         currDiagnostics.push(diagnosticToRuntimeError(normalizedDiagnostic))
-        logChunk += os.EOL + diagnosticToTerminalLog(normalizedDiagnostic, 'TypeScript')
+        logChunk += os.EOL + diagnosticToTerminalLog(normalizedDiagnostic, 'vue-tsc')
       }
 
       const reportWatchStatusChanged: ts.WatchStatusReporter = (
@@ -93,7 +92,7 @@ const createDiagnostic: CreateDiagnostic<'vueTsc'> = (pluginConfig) => {
             if (overlay) {
               parentPort?.postMessage({
                 type: ACTION_TYPES.overlayError,
-                payload: toViteCustomPayload('typescript', currDiagnostics),
+                payload: toViteCustomPayload('vue-tsc', currDiagnostics),
               })
             }
         }
@@ -105,9 +104,7 @@ const createDiagnostic: CreateDiagnostic<'vueTsc'> = (pluginConfig) => {
 
           if (terminal) {
             consoleLog(
-              logChunk +
-                os.EOL +
-                wrapCheckerSummary('TypeScript', diagnostic.messageText.toString())
+              logChunk + os.EOL + wrapCheckerSummary('vue-tsc', diagnostic.messageText.toString())
             )
           }
         })
@@ -117,27 +114,16 @@ const createDiagnostic: CreateDiagnostic<'vueTsc'> = (pluginConfig) => {
       // https://github.com/microsoft/TypeScript/pull/33082/files
       const createProgram = vueTs.createSemanticDiagnosticsBuilderProgram
 
-      if (typeof pluginConfig.vueTsc === 'object' && pluginConfig.vueTsc.buildMode) {
-        // const host = ts.createSolutionBuilderWithWatchHost(
-        //   ts.sys,
-        //   createProgram,
-        //   reportDiagnostic,
-        //   undefined,
-        //   reportWatchStatusChanged
-        // )
-        // ts.createSolutionBuilderWithWatch(host, [configFile], {}).build()
-      } else {
-        const host = vueTs.createWatchCompilerHost(
-          configFile,
-          { noEmit: true },
-          vueTs.sys,
-          createProgram,
-          reportDiagnostic,
-          reportWatchStatusChanged
-        )
+      const host = vueTs.createWatchCompilerHost(
+        configFile,
+        { noEmit: true },
+        vueTs.sys,
+        createProgram,
+        reportDiagnostic,
+        reportWatchStatusChanged
+      )
 
-        vueTs.createWatchProgram(host)
-      }
+      vueTs.createWatchProgram(host)
     },
   }
 }
@@ -149,12 +135,10 @@ export class VueTscChecker extends Checker<'vueTsc'> {
       absFilePath: __filename,
       build: {
         buildBin: (config) => {
-          if (typeof config.typescript === 'object') {
-            const { root, tsconfigPath, buildMode } = config.typescript
-
-            // Compiler option '--noEmit' may not be used with '--build'
-            let args = [buildMode ? '-b' : '--noEmit']
+          if (typeof config.vueTsc === 'object') {
+            const { root, tsconfigPath } = config.vueTsc
 
+            let args = ['--noEmit']
             // Custom config path
             if (tsconfigPath) {
               const fullConfigPath = root ? path.join(root, tsconfigPath) : tsconfigPath

diff --git a/packages/vite-plugin-checker/src/logger.ts b/packages/vite-plugin-checker/src/logger.ts
@@ -316,6 +316,12 @@ export function lspRange2Location(range: Range): SourceLocation {
 
 /* --------------------------------- vue-tsc -------------------------------- */
 
+export function normalizeVueTscDiagnostic(d: TsDiagnostic): NormalizedDiagnostic {
+  const diagnostic = normalizeTsDiagnostic(d)
+  diagnostic.checker = 'vue-tsc'
+  return diagnostic
+}
+
 /* --------------------------------- ESLint --------------------------------- */
 
 const isNormalizedDiagnostic = (

diff --git a/packages/vite-plugin-checker/src/types.ts b/packages/vite-plugin-checker/src/types.ts
@@ -37,7 +37,7 @@ export type VueTscConfig =
    * - set to `true` to enable type checking with default configuration
    * - set to `false` to disable type checking, you can also remove `config.vueTsc` directly
    */
-  boolean | Partial<Omit<TsConfigOptions, 'build'>>
+  boolean | Partial<Omit<TsConfigOptions, 'buildMode'>>
 
 /** vls checker configuration */
 export type VlsConfig = boolean | DeepPartial<VlsOptions>

diff --git a/playground/vue3-vue-tsc/tsconfig.json b/playground/vue3-vue-tsc/tsconfig.json
@@ -6,7 +6,6 @@
     "strict": true,
     "jsx": "preserve",
     "sourceMap": true,
-    "noEmit": true,
     "resolveJsonModule": true,
     "esModuleInterop": true,
     "lib": ["esnext", "dom"],