diff --git a/packages/uni-uts-vite/src/plugins/v1.ts b/packages/uni-uts-vite/src/plugins/v1.ts index 1bfff1ca292214536132694e6c1cf8f087e3b604..695f11e5f35c07dba1d4fd55ee792e99378a0e8f 100644 --- a/packages/uni-uts-vite/src/plugins/v1.ts +++ b/packages/uni-uts-vite/src/plugins/v1.ts @@ -1,6 +1,7 @@ import type { Plugin } from 'vite' import path from 'path' import { + isInHBuilderX, normalizePath, parseVueRequest, requireResolve, @@ -53,7 +54,7 @@ export function uniUtsV1Plugin(): Plugin { // 懒加载 uts 编译器 // eslint-disable-next-line no-restricted-globals const { parse } = require('@dcloudio/uts') - const ast = await parse(code) + const ast = await parse(code, { noColor: isInHBuilderX() }) code = ` import { initUtsProxyClass, initUtsProxyFunction } from '@dcloudio/uni-app' const pkg = '${pkg}' diff --git a/packages/uni-uts-vite/src/utils/compiler.ts b/packages/uni-uts-vite/src/utils/compiler.ts index 2bfc2c433b6f988c1b93e443fe7b6e003a71ca08..8ba8e4b7e4df40f6a5df3adcfd19f5906f230fa1 100644 --- a/packages/uni-uts-vite/src/utils/compiler.ts +++ b/packages/uni-uts-vite/src/utils/compiler.ts @@ -4,7 +4,11 @@ import path from 'path' import AdmZip from 'adm-zip' import { sync } from 'fast-glob' import type { parse, bundle, UtsTarget } from '@dcloudio/uts' -import { installHBuilderXPlugin, normalizePath } from '@dcloudio/uni-cli-shared' +import { + installHBuilderXPlugin, + isInHBuilderX, + normalizePath, +} from '@dcloudio/uni-cli-shared' import { camelize } from '@vue/shared' export function getUtsCompiler(): { @@ -42,6 +46,7 @@ export async function compile(filename: string) { 'io.dcloud.uts.*', ], logFilename: true, + noColor: isInHBuilderX(), }, }) console.log('uts compile time: ' + (Date.now() - time) + 'ms') diff --git a/packages/uts-darwin-arm64/uts.darwin-arm64.node b/packages/uts-darwin-arm64/uts.darwin-arm64.node index 393abd6aee829ab2d09527525b4250c2fb794e6f..e7a24d03ce196bdcda49311a82babfa61cc39f28 100755 Binary files a/packages/uts-darwin-arm64/uts.darwin-arm64.node and b/packages/uts-darwin-arm64/uts.darwin-arm64.node differ diff --git a/packages/uts-darwin-x64/uts.darwin-x64.node b/packages/uts-darwin-x64/uts.darwin-x64.node index 30f40733cd1102041d49e2f7d9d8c5375735e4db..b892dfedc354cc60c9bf843ecbfbb632b0bd60f0 100755 Binary files a/packages/uts-darwin-x64/uts.darwin-x64.node and b/packages/uts-darwin-x64/uts.darwin-x64.node differ diff --git a/packages/uts/src/api.ts b/packages/uts/src/api.ts index da82bd3d84760abd57db08c289d4dd6d741a1c7d..cdaff0c1a2ab292062becffee9fd03300d2210e7 100644 --- a/packages/uts/src/api.ts +++ b/packages/uts/src/api.ts @@ -41,11 +41,13 @@ function resolveOptions(options: UtsOptions) { output.outDir = normalizePath(output.outDir) output.sourceMap = normalizePath(output.sourceMap) output.logFilename = !!output.logFilename + output.noColor = !!output.noColor return options } export function parse(source: string, options: UtsParseOptions = {}) { + options.noColor = !!options.noColor return bindings .parse(source, toBuffer(options)) .then((res: string) => JSON.parse(res)) diff --git a/packages/uts/src/types.ts b/packages/uts/src/types.ts index dde83e151c9443a8aecb18b79f3b66e6fad34511..03e4cfca7fbcbf3871f41a32a989fd4c2ad7a248 100644 --- a/packages/uts/src/types.ts +++ b/packages/uts/src/types.ts @@ -12,6 +12,7 @@ export interface UtsParserConfig { export type UtsParseOptions = UtsParserConfig & { filename?: string comments?: boolean + noColor?: boolean } export type UtsInputOptions = UtsParseOptions & { @@ -27,6 +28,7 @@ export type UtsOutputOptions = { inlineSourcesContent?: boolean extname: string logFilename?: boolean + noColor?: boolean } export interface UtsOptions { input: UtsInputOptions