From 34a106c79eecdd3eeabb2afd5124f818da811837 Mon Sep 17 00:00:00 2001
From: fxy060608 <fxy060608@gmail.com>
Date: Sat, 14 Aug 2021 14:46:40 +0800
Subject: [PATCH] chore: improve log

---
 packages/uni-app-vite/src/plugin/index.ts     |  9 +--------
 packages/uni-cli-shared/src/messages/index.ts |  1 +
 packages/vite-plugin-uni/src/cli/utils.ts     | 19 ++++++++++++++++++-
 packages/vite-plugin-uni/src/config/build.ts  |  5 ++++-
 .../vite-plugin-uni/src/configResolved/env.ts | 10 ----------
 5 files changed, 24 insertions(+), 20 deletions(-)

diff --git a/packages/uni-app-vite/src/plugin/index.ts b/packages/uni-app-vite/src/plugin/index.ts
index 16db8a677..bc2db9aa5 100644
--- a/packages/uni-app-vite/src/plugin/index.ts
+++ b/packages/uni-app-vite/src/plugin/index.ts
@@ -1,4 +1,4 @@
-import { M, UniVitePlugin } from '@dcloudio/uni-cli-shared'
+import { UniVitePlugin } from '@dcloudio/uni-cli-shared'
 
 import { uniOptions } from './uni'
 import { buildOptions } from './build'
@@ -8,13 +8,6 @@ export const UniAppPlugin: UniVitePlugin = {
   name: 'vite:uni-app',
   uni: uniOptions(),
   config() {
-    const pkg = require('@dcloudio/vite-plugin-uni/package.json')
-    console.log(
-      M['app.compiler.version'].replace(
-        '{version}',
-        pkg['uni-app']['compilerVersion'] + '（vue3）'
-      )
-    )
     return {
       build: buildOptions(),
     }
diff --git a/packages/uni-cli-shared/src/messages/index.ts b/packages/uni-cli-shared/src/messages/index.ts
index 6693b6681..05414b071 100644
--- a/packages/uni-cli-shared/src/messages/index.ts
+++ b/packages/uni-cli-shared/src/messages/index.ts
@@ -1,5 +1,6 @@
 export const M = {
   'app.compiler.version': '编译器版本：{version}',
+  compiling: '正在编译中...',
   'dev.performance':
     '请注意运行模式下，因日志输出、sourcemap以及未压缩源码等原因，性能和包体积，均不及发行模式。',
   'dev.performance.nvue': '尤其是app-nvue的sourcemap影响较大',
diff --git a/packages/vite-plugin-uni/src/cli/utils.ts b/packages/vite-plugin-uni/src/cli/utils.ts
index 0ef153891..251c45c00 100644
--- a/packages/vite-plugin-uni/src/cli/utils.ts
+++ b/packages/vite-plugin-uni/src/cli/utils.ts
@@ -2,7 +2,7 @@ import fs from 'fs'
 import path from 'path'
 import { BuildOptions, InlineConfig } from 'vite'
 
-import { isInHBuilderX } from '@dcloudio/uni-cli-shared'
+import { M, isInHBuilderX } from '@dcloudio/uni-cli-shared'
 
 import { CliOptions } from '.'
 import { initNVueEnv } from './nvue'
@@ -89,8 +89,25 @@ export function initEnv(type: 'dev' | 'build', options: CliOptions) {
     }
   }
   if (process.env.UNI_PLATFORM === 'app') {
+    const pkg = require('../../package.json')
+    console.log(
+      M['app.compiler.version'].replace(
+        '{version}',
+        pkg['uni-app']['compilerVersion'] + '（vue3）'
+      )
+    )
     initNVueEnv()
   }
+
+  if (process.env.NODE_ENV === 'development') {
+    console.log(
+      M['dev.performance'] +
+        (process.env.UNI_PLATFORM.startsWith('mp-')
+          ? M['dev.performance.mp']
+          : '')
+    )
+  }
+  console.log(M['compiling'])
 }
 
 export function cleanOptions(options: CliOptions) {
diff --git a/packages/vite-plugin-uni/src/config/build.ts b/packages/vite-plugin-uni/src/config/build.ts
index f4e3d1b4a..6b23000ae 100644
--- a/packages/vite-plugin-uni/src/config/build.ts
+++ b/packages/vite-plugin-uni/src/config/build.ts
@@ -13,7 +13,10 @@ export function createBuild(
         if (warning.code === 'UNUSED_EXTERNAL_IMPORT') {
           const { message } = warning
           // ignore
-          if (message.includes('"resolveComponent"')) {
+          if (
+            message.includes('"vue"') ||
+            message.includes('"resolveComponent"')
+          ) {
             return
           }
         }
diff --git a/packages/vite-plugin-uni/src/configResolved/env.ts b/packages/vite-plugin-uni/src/configResolved/env.ts
index 8bb0055af..37e850fbb 100644
--- a/packages/vite-plugin-uni/src/configResolved/env.ts
+++ b/packages/vite-plugin-uni/src/configResolved/env.ts
@@ -1,8 +1,6 @@
 import path from 'path'
 import { ResolvedConfig } from 'vite'
 
-import { M } from '@dcloudio/uni-cli-shared'
-
 export function initEnv(config: ResolvedConfig) {
   if (!process.env.UNI_PLATFORM) {
     process.env.UNI_PLATFORM = 'h5'
@@ -16,12 +14,4 @@ export function initEnv(config: ResolvedConfig) {
   if (!process.env.UNI_OUTPUT_DIR) {
     process.env.UNI_OUTPUT_DIR = path.resolve(config.root, config.build.outDir)
   }
-  if (!config.isProduction) {
-    console.log(
-      M['dev.performance'] +
-        (process.env.UNI_PLATFORM.startsWith('mp-')
-          ? M['dev.performance.mp']
-          : '')
-    )
-  }
 }
-- 
GitLab