From 259bf28e2bb8f891b09e8f85419e0267b968fd07 Mon Sep 17 00:00:00 2001 From: yihuineng <471110230@qq.com> Date: Mon, 29 Jan 2024 16:38:06 +0800 Subject: [PATCH] =?UTF-8?q?chore:=20coverage=20=E7=A7=BB=E9=99=A4=E5=A4=9A?= =?UTF-8?q?=E4=BD=99=E7=9A=84callback?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/coverage.js | 19 +++++++++---------- package.json | 2 +- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/lib/coverage.js b/lib/coverage.js index 1ac5cb0..c6a082b 100644 --- a/lib/coverage.js +++ b/lib/coverage.js @@ -27,22 +27,23 @@ const reporter = new Reporter(); const useRemap = process.env.MACACA_REPORTER_USE_REMAP; -module.exports = (callback) => { +module.exports = () => { const coverageDir = path.join(cwd, 'coverage', '.temp'); if (!_.isExistedDir(coverageDir)) { - return callback(); + logger.info(`coverageDir not exist: ${coverageDir}`); + return; } const coverageFiles = fs .readdirSync(coverageDir) .filter(i => path.extname(i) === '.json'); if (!coverageFiles.length) { - return callback(); + logger.info('coverageFiles not found'); + return; } - coverageFiles.map(i => { - const file = path.join(coverageDir, i); - const content = fs.readFileSync(file, 'utf8'); + coverageFiles.forEach(cFile => { + const content = fs.readFileSync(path.join(coverageDir, cFile), 'utf8'); const __coverage__ = CircularJson.parse(content); if (useRemap) { @@ -50,9 +51,7 @@ module.exports = (callback) => { warn: () => {}, warnMissingSourceMaps: false, mapFileName: filename => { - const originName = filename - .replace(/\.vue\.[jt]s(\?.+)?$/, '.vue'); - return originName; + return filename.replace(/\.vue\.[jt]s(\?.+)?$/, '.vue'); }, }); collector.add(_collector.getFinalCoverage()); @@ -68,10 +67,10 @@ module.exports = (callback) => { ]); reporter.write(collector, true, () => { if (!isCI) { + logger.info('is not ci, clean coverageDir'); _.rimraf(coverageDir); } const coverageHtml = path.join(cwd, 'coverage', 'index.html'); logger.info(chalk.cyan(`coverage reporter generated: ${coverageHtml}`)); - callback(); }); }; diff --git a/package.json b/package.json index 8b7c7a8..d00f30b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "macaca-reporter", - "version": "1.9.16", + "version": "1.9.17", "description": "Reporter for mocha and other frameworks.", "keywords": [ "macaca",