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 509aa7525b686dc0eefea57f4840a869b1031c23..9f8c24e3e17886fac051daf9ec9cbabc9e4a28d2 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 7b566ab7da1ac27dab60dbcdac3a8e9125d7bd29..0000000000000000000000000000000000000000 --- 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 d0877175620e2faa4ef37bdd32ef79611baa6f77..2c72ceb8a9ba542a9104c69059b5d4786e4b6b19 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 0000000000000000000000000000000000000000..7649a5407e861213fcb96e1bc3994c0702672866 --- /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