From 7a2d250fb5c776757ed4ca23b103ab6c31294a2e Mon Sep 17 00:00:00 2001
From: DCloud_LXH <283700113@qq.com>
Date: Thu, 21 Apr 2022 18:33:32 +0800
Subject: [PATCH] chore: HBuilder X console overrided

---
 .../webpack-uni-nvue-loader/lib/style.js      |  7 ++---
 .../vue-cli-plugin-hbuilderx/util/console.js  | 23 ---------------
 packages/vue-cli-plugin-uni/lib/env.js        |  3 +-
 packages/vue-cli-plugin-uni/util/console.js   | 28 +++++++++++++++++++
 4 files changed, 33 insertions(+), 28 deletions(-)
 delete mode 100644 packages/vue-cli-plugin-hbuilderx/util/console.js
 create mode 100644 packages/vue-cli-plugin-uni/util/console.js

diff --git a/packages/vue-cli-plugin-hbuilderx/packages/webpack-uni-nvue-loader/lib/style.js b/packages/vue-cli-plugin-hbuilderx/packages/webpack-uni-nvue-loader/lib/style.js
index 509aa7525..9f8c24e3e 100644
--- a/packages/vue-cli-plugin-hbuilderx/packages/webpack-uni-nvue-loader/lib/style.js
+++ b/packages/vue-cli-plugin-hbuilderx/packages/webpack-uni-nvue-loader/lib/style.js
@@ -8,7 +8,6 @@ module.exports = function (content, map) {
   this.callback(null, 'module.exports = ' + genStyleString(content, this), map)
 }
 const uniI18n = require('@dcloudio/uni-cli-i18n')
-const print = require('../../../util/console')
 
 // @todo:
 // font-relative lengths: em, ex, ch, ic
@@ -60,13 +59,13 @@ function genStyleString (input, loader) {
           msgs.forEach(msg => {
             switch (msg.split(':')[0]) {
               case 'ERROR':
-                print.error(msg)
+                console.error(msg)
                 break
               case 'WARNING' :
-                print.warn(msg)
+                console.warn(msg)
                 break
               default:
-                print.log(msg)
+                console.log(msg)
                 break
             }
           })
diff --git a/packages/vue-cli-plugin-hbuilderx/util/console.js b/packages/vue-cli-plugin-hbuilderx/util/console.js
deleted file mode 100644
index 7b566ab7d..000000000
--- a/packages/vue-cli-plugin-hbuilderx/util/console.js
+++ /dev/null
@@ -1,23 +0,0 @@
-const ZERO_WIDTH_CHAR = {
-  NOTE: '',
-  WARNING: '\u200B',
-  ERROR: '\u200C',
-  backup0: '\u200D',
-  backup1: '\u200E',
-  backup2: '\u200F',
-  backup3: '\uFEFF'
-}
-
-module.exports = {
-  warn (msg) {
-    msg = ZERO_WIDTH_CHAR.WARNING + msg + ZERO_WIDTH_CHAR.WARNING
-    console.warn(msg)
-  },
-  error (msg) {
-    msg = ZERO_WIDTH_CHAR.ERROR + msg + ZERO_WIDTH_CHAR.ERROR
-    console.error(msg)
-  },
-  log (msg) {
-    console.log(msg)
-  }
-}
diff --git a/packages/vue-cli-plugin-uni/lib/env.js b/packages/vue-cli-plugin-uni/lib/env.js
index d08771756..2c72ceb8a 100644
--- a/packages/vue-cli-plugin-uni/lib/env.js
+++ b/packages/vue-cli-plugin-uni/lib/env.js
@@ -6,6 +6,7 @@ const uniI18n = require('@dcloudio/uni-cli-i18n')
 const moduleAlias = require('module-alias')
 
 require('./error-reporting')
+require('../util/console')
 
 const hasOwnProperty = Object.prototype.hasOwnProperty
 
@@ -526,4 +527,4 @@ runByHBuilderX && console.log(uniI18n.__('compiling'))
 
 module.exports = {
   manifestPlatformOptions: platformOptions
-}
+}
diff --git a/packages/vue-cli-plugin-uni/util/console.js b/packages/vue-cli-plugin-uni/util/console.js
new file mode 100644
index 000000000..7649a5407
--- /dev/null
+++ b/packages/vue-cli-plugin-uni/util/console.js
@@ -0,0 +1,28 @@
+const ZERO_WIDTH_CHAR = {
+  NOTE: '',
+  WARNING: '\u200B',
+  ERROR: '\u200C',
+  backup0: '\u200D',
+  backup1: '\u200E',
+  backup2: '\u200F',
+  backup3: '\uFEFF'
+}
+
+if (console) {
+  function overridedConsole(name, oldFn, char) {
+    console[name] = function (...args) {
+      oldFn.apply(this, args.map(arg => {
+        let item
+        if (typeof arg !== 'object') {
+          item = `${char}${arg}${char}`
+        } else {
+          item = `${char}${JSON.stringify(arg)}${char}`
+        }
+
+        return item
+      }))
+    }
+  }
+  overridedConsole('warn', console.warn, ZERO_WIDTH_CHAR.WARNING)
+  // overridedConsole('error', console.error, ZERO_WIDTH_CHAR.ERROR)
+}
\ No newline at end of file
-- 
GitLab