From f9743bfbd5e8c503b1393c1368aead3154a893a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Allen=20Zhang=20=28=E5=BC=A0=E6=B6=9B=29?= Date: Thu, 18 Jul 2024 17:24:52 +0800 Subject: [PATCH] feat: update --- packages/canyon-backend/package.json | 1 - packages/canyon-backend/src/utils/coverage.ts | 9 +++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/canyon-backend/package.json b/packages/canyon-backend/package.json index 07345072..05fd3222 100755 --- a/packages/canyon-backend/package.json +++ b/packages/canyon-backend/package.json @@ -26,7 +26,6 @@ "axios": "^1.7.2", "better-sqlite3": "^9.6.0", "body-parser": "^1.20.2", - "canyon-data": "^0.1.1-alpha.5", "class-transformer": "^0.5.1", "class-validator": "^0.14.1", "cookie-parser": "^1.4.6", diff --git a/packages/canyon-backend/src/utils/coverage.ts b/packages/canyon-backend/src/utils/coverage.ts index 65ae3757..70fc39e2 100755 --- a/packages/canyon-backend/src/utils/coverage.ts +++ b/packages/canyon-backend/src/utils/coverage.ts @@ -1,7 +1,7 @@ import * as libCoverage from 'istanbul-lib-coverage'; import * as libSourceMaps from 'istanbul-lib-source-maps'; import { mergeCoverageMap as mergeCoverageMapOfCanyonData } from '@canyon/data'; -import { merge_coverage_json_str } from 'canyon-data'; +// import { merge_coverage_json_str } from 'canyon-data'; function parseInstrumentCwd(instrumentCwd) { if (instrumentCwd.includes('=>')) { const instrumentCwdSplit = instrumentCwd.split('=>'); @@ -90,9 +90,10 @@ export const mergeCoverageMap = (cov1: any, cov2: any) => { // console.log(`size of cov1: ${size}M`); return mergeCoverageMapOfCanyonData(cov1, cov2); } else { - return JSON.parse( - merge_coverage_json_str(JSON.stringify(cov1), JSON.stringify(cov2)), - ); + return mergeCoverageMapOfCanyonData(cov1, cov2); + // return JSON.parse( + // merge_coverage_json_str(JSON.stringify(cov1), JSON.stringify(cov2)), + // ); } };