wip(dom2): 优化错误日志与警告日志交叉

Author: fxy060608

packages/uni-cli-shared/src/logs/index.ts

@@ -39,35 +39,59 @@ export interface CompileLogOptions {
   column?: number
 }
 
+const suppressedCompileLogs: Array<() => void> = []
+
+let isSuppressed = false
+
+export function suppressVueCompileLog(suppressed: boolean) {
+  isSuppressed = suppressed
+  if (!suppressed) {
+    suppressedCompileLogs.forEach((fn) => fn())
+    suppressedCompileLogs.length = 0
+  }
+}
+
 export function onCompileLog(
   type: 'warn' | 'error',
   error: CompileLogError,
   code: string,
   relativeFileName: string,
   options?: CompileLogOptions
 ) {
-  const char =
-    type === 'warn' ? SPECIAL_CHARS.WARN_BLOCK : SPECIAL_CHARS.ERROR_BLOCK
-  if (options?.plugin) {
-    // CSS 插件格式
-    const colorFn = type === 'warn' ? colors.yellow : (s: string) => s
-    console[type](char + colorFn(`[plugin:${options.plugin}] ${error.message}`))
-    let msg = formatAtFilename(relativeFileName, options.line, options.column)
-    if (options.line && options.column) {
-      msg += `\n${generateCodeFrame(code, {
-        line: options.line,
-        column: options.column,
-      }).replace(/\t/g, ' ')}\n`
-    }
-    console.log(msg + char)
-  } else {
-    console[type](char + type + ': ' + error.message + (error.loc ? '' : char))
-    if (error.loc) {
-      const start = error.loc.start
-      console.log(
-        'at ' + relativeFileName + ':' + start.line + ':' + start.column
+  if (isSuppressed) {
+    // 不会导致内存泄漏吧？
+    suppressedCompileLogs.push(print)
+    return
+  }
+  print()
+  function print() {
+    const char =
+      type === 'warn' ? SPECIAL_CHARS.WARN_BLOCK : SPECIAL_CHARS.ERROR_BLOCK
+    if (options?.plugin) {
+      // CSS 插件格式
+      const colorFn = type === 'warn' ? colors.yellow : (s: string) => s
+      console[type](
+        char + colorFn(`[plugin:${options.plugin}] ${error.message}`)
+      )
+      let msg = formatAtFilename(relativeFileName, options.line, options.column)
+      if (options.line && options.column) {
+        msg += `\n${generateCodeFrame(code, {
+          line: options.line,
+          column: options.column,
+        }).replace(/\t/g, ' ')}\n`
+      }
+      console.log(msg + char)
+    } else {
+      console[type](
+        char + type + ': ' + error.message + (error.loc ? '' : char)
       )
-      console.log(generateCodeFrameColumns(code, error.loc) + char)
+      if (error.loc) {
+        const start = error.loc.start
+        console.log(
+          'at ' + relativeFileName + ':' + start.line + ':' + start.column
+        )
+        console.log(generateCodeFrameColumns(code, error.loc) + char)
+      }
     }
   }
 }

packages/vite-plugin-uni/src/cli/action.ts

@@ -10,6 +10,7 @@ import {
   isInHBuilderX,
   output,
   runByHBuilderX,
+  suppressVueCompileLog,
 } from '@dcloudio/uni-cli-shared'
 import type { CliOptions } from '.'
 import { build, buildSSR } from './build'
@@ -52,8 +53,12 @@ export async function runDev(options: CliOptions & ServerOptions) {
       initEasycom()
       let isFirstStart = true
       let isFirstEnd = true
+      const isDom2 = process.env.UNI_APP_X_DOM2 === 'true'
       await build(options, async (event) => {
         if (event.code === 'BUNDLE_START') {
+          if (isDom2) {
+            suppressVueCompileLog(false)
+          }
           if (isFirstStart) {
             isFirstStart = false
             return
@@ -146,6 +151,9 @@ export async function runDev(options: CliOptions & ServerOptions) {
             }, 2000)
           }
         } else if (event.code === 'ERROR') {
+          if (isDom2) {
+            suppressVueCompileLog(true)
+          }
           if (runByHBuilderX()) {
             setTimeout(() => {
               console.error(`Build failed with errors.`)