move minimatch, diff-sequences, @bcoe/v8-coverage, @jridgewell/source…

…map-codec from vendor
cenfun · Jul 8, 2024 · e621c83 · e621c83
1 parent 96f0fde
commit e621c83
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 37 deletions.
diff --git a/lib/converter/converter.js b/lib/converter/converter.js
@@ -17,7 +17,9 @@ const {
     sortRanges, dedupeCountRanges, mergeRangesWith
 } = require('../utils/dedupe.js');
 const { getSourceType, initSourceMapSourcesPath } = require('../utils/source-path.js');
-const { decode, minimatch } = require('../packages/monocart-coverage-vendor.js');
+
+const { decode } = require('@jridgewell/sourcemap-codec');
+const { minimatch } = require('minimatch');
 
 const InfoBranch = require('./info-branch.js');
 const InfoFunction = require('./info-function.js');

diff --git a/lib/converter/find-original-range.js b/lib/converter/find-original-range.js
@@ -1,4 +1,4 @@
-const { diff } = require('../packages/monocart-coverage-vendor');
+const diffSequence = require('diff-sequences').default;
 const Util = require('../utils/util.js');
 const EC = Util.EC;
 
@@ -79,7 +79,7 @@ const alignText = (gt, ot, info) => {
     // console.log(ol);
 
     const commonItems = [];
-    diff(gl.length, ol.length, (gi, oi) => {
+    diffSequence(gl.length, ol.length, (gi, oi) => {
         return gl[gi].value === ol[oi].value;
     }, (len, gi, oi) => {
         commonItems.push([gi, oi, len]);

diff --git a/lib/generate.js b/lib/generate.js
@@ -14,7 +14,7 @@ const { mergeV8Coverage, saveV8Report } = require('./v8/v8.js');
 const { convertV8List } = require('./converter/converter.js');
 const { resolveSourceMap } = require('./converter/collect-source-maps.js');
 
-const { minimatch } = require('./packages/monocart-coverage-vendor.js');
+const { minimatch } = require('minimatch');
 const { getGroupedRows } = require('./utils/snapshot.js');
 const generateMarkdownGrid = require('./utils/markdown.js');
 

diff --git a/lib/v8/v8.js b/lib/v8/v8.js
@@ -1,12 +1,14 @@
 const path = require('path');
 const EC = require('eight-colors');
+const { minimatch } = require('minimatch');
+const { mergeScriptCovs } = require('@bcoe/v8-coverage');
+
 const Util = require('../utils/util.js');
 const { getV8Summary } = require('./v8-summary.js');
 const { dedupeFlatRanges } = require('../utils/dedupe.js');
 const {
     resolveAnonymousUrl, normalizeSourcePath, getSourcePathReplacer
 } = require('../utils/source-path.js');
-const { mergeScriptCovs, minimatch } = require('../packages/monocart-coverage-vendor.js');
 const { collectSourceMaps } = require('../converter/collect-source-maps.js');
 const version = require('../../package.json').version;
 

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -74,17 +74,21 @@
         "url": "git+https://github.com/cenfun/monocart-coverage-reports.git"
     },
     "dependencies": {
+        "@bcoe/v8-coverage": "^0.2.3",
+        "@jridgewell/sourcemap-codec": "^1.4.15",
         "acorn": "^8.12.1",
         "acorn-loose": "^8.4.0",
         "acorn-walk": "^8.3.3",
         "commander": "^12.1.0",
         "console-grid": "^2.2.2",
+        "diff-sequences": "^29.6.3",
         "eight-colors": "^1.3.0",
         "foreground-child": "^3.2.1",
         "istanbul-lib-coverage": "^3.2.2",
         "istanbul-lib-report": "^3.0.1",
         "istanbul-reports": "^3.1.7",
         "lz-utils": "^2.0.2",
+        "minimatch": "^9.0.5",
         "monocart-code-viewer": "^1.1.4",
         "monocart-formatter": "^3.0.0",
         "monocart-locator": "^1.0.2",
@@ -97,7 +101,6 @@
         "eslint-plugin-html": "^8.1.1",
         "eslint-plugin-vue": "^9.27.0",
         "find-up": "^7.0.0",
-        "minimatch": "^9.0.5",
         "starfall-cli": "^2.0.20",
         "stylelint": "^16.6.1",
         "stylelint-config-plus": "^1.1.2",

diff --git a/packages/vendor/package.json b/packages/vendor/package.json
@@ -9,10 +9,7 @@
     "license": "MIT",
     "dependencies": {},
     "devDependencies": {
-        "@bcoe/v8-coverage": "^0.2.3",
-        "@jridgewell/sourcemap-codec": "^1.4.15",
         "convert-source-map": "^2.0.0",
-        "diff-sequences": "^29.6.3",
         "postcss": "^8.4.39"
     },
     "platform": "node"

diff --git a/packages/vendor/src/index.js b/packages/vendor/src/index.js
@@ -1,17 +1,9 @@
 import * as convertSourceMap from 'convert-source-map';
 
-import { decode } from '@jridgewell/sourcemap-codec';
-
-import { mergeScriptCovs } from '@bcoe/v8-coverage';
-
 import parseCss from 'postcss/lib/parse';
 
-import { minimatch } from 'minimatch';
-
 import WebSocket from 'ws';
 
-import diff from 'diff-sequences';
-
 import { findUpSync } from 'find-up';
 
 import supportsColor from 'supports-color';
@@ -20,17 +12,10 @@ export {
 
     convertSourceMap,
 
-    decode,
-
-    mergeScriptCovs,
-
     parseCss,
 
-    minimatch,
     WebSocket,
 
-    diff,
-
     findUpSync,
 
     supportsColor