feat: update

canyon-project · Jul 18, 2024 · f9743bf · f9743bf
1 parent 04f8c31
commit f9743bf
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git 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
@@ -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)),
+    // );
   }
 };