From 00e40869ed1be1c5681ca97f4b8006a183053863 Mon Sep 17 00:00:00 2001
From: Jason Dent <Jason3S@users.noreply.github.com>
Date: Sun, 20 Aug 2023 12:08:45 +0200
Subject: [PATCH] test: clean up coverage generation (#4730)

---
 packages/cspell-dictionary/package.json      | 4 +---
 packages/cspell-gitignore/package.json       | 4 +---
 packages/cspell-glob/package.json            | 4 +---
 packages/cspell-grammar/package.json         | 4 +---
 packages/cspell-io/package.json              | 4 +---
 packages/cspell-json-reporter/package.json   | 4 +---
 packages/cspell-lib/package.json             | 4 +---
 packages/cspell-pipe/package.json            | 4 +---
 packages/cspell-service-bus/package.json     | 4 +---
 packages/cspell-strong-weak-map/package.json | 4 +---
 packages/cspell-tools/package.json           | 3 +--
 packages/cspell-trie-lib/package.json        | 4 +---
 packages/cspell-trie/package.json            | 4 +---
 packages/cspell-types/package.json           | 4 +---
 packages/cspell/package.json                 | 4 +---
 packages/dynamic-import/package.json         | 4 +---
 packages/hunspell-reader/package.json        | 4 +---
 17 files changed, 17 insertions(+), 50 deletions(-)

diff --git a/packages/cspell-dictionary/package.json b/packages/cspell-dictionary/package.json
index 393c0f5033f..629bb02e24b 100644
--- a/packages/cspell-dictionary/package.json
+++ b/packages/cspell-dictionary/package.json
@@ -23,9 +23,7 @@
     "clean": "shx rm -rf dist temp coverage \"*.tsbuildInfo\"",
     "build": "tsc -b .",
     "clean-build": "pnpm run clean && pnpm run build",
-    "coverage": "pnpm coverage:vitest && pnpm coverage:fix",
-    "coverage:vitest": "vitest run --coverage",
-    "coverage:fix": "nyc report --temp-dir \"$(pwd)/coverage\" --reporter lcov --report-dir \"$(pwd)/coverage\" --cwd ../..",
+    "coverage": "vitest run --coverage",
     "test:watch": "vitest",
     "test": "vitest run",
     "watch": "tsc -b . -w"
diff --git a/packages/cspell-gitignore/package.json b/packages/cspell-gitignore/package.json
index 6f945d93f28..8fa5b0951a6 100644
--- a/packages/cspell-gitignore/package.json
+++ b/packages/cspell-gitignore/package.json
@@ -35,9 +35,7 @@
     "clean": "shx rm -rf dist temp coverage \"*.tsbuildInfo\"",
     "build": "tsc -b .",
     "clean-build": "pnpm run clean && pnpm run build",
-    "coverage": "pnpm coverage:vitest && pnpm coverage:fix",
-    "coverage:vitest": "vitest run --coverage",
-    "coverage:fix": "nyc report --temp-dir \"$(pwd)/coverage\" --reporter lcov --report-dir \"$(pwd)/coverage\" --cwd ../..",
+    "coverage": "vitest run --coverage",
     "test:watch": "vitest",
     "test": "vitest run",
     "watch": "tsc -b . -w"
diff --git a/packages/cspell-glob/package.json b/packages/cspell-glob/package.json
index 359d2dabb7e..16963229800 100644
--- a/packages/cspell-glob/package.json
+++ b/packages/cspell-glob/package.json
@@ -36,9 +36,7 @@
     "build": "tsc -b . && ts2mjs dist/esm",
     "build:esm": "tsc -p tsconfig.esm.json",
     "clean-build": "pnpm run clean && pnpm run build",
-    "coverage": "pnpm coverage:vitest && pnpm coverage:fix",
-    "coverage:vitest": "vitest run --coverage",
-    "coverage:fix": "nyc report --temp-dir \"$(pwd)/coverage\" --reporter lcov --report-dir \"$(pwd)/coverage\" --cwd ../..",
+    "coverage": "vitest run --coverage",
     "test:watch": "vitest",
     "test": "vitest run",
     "watch": "tsc -b . -w"
diff --git a/packages/cspell-grammar/package.json b/packages/cspell-grammar/package.json
index 15e14caa3ef..25b26a920ce 100644
--- a/packages/cspell-grammar/package.json
+++ b/packages/cspell-grammar/package.json
@@ -63,9 +63,7 @@
     "clean": "shx rm -rf dist temp coverage \"*.tsbuildInfo\"",
     "build": "tsc -b .",
     "clean-build": "pnpm run clean && pnpm run build",
-    "coverage": "pnpm coverage:vitest && pnpm coverage:fix",
-    "coverage:vitest": "vitest run --coverage",
-    "coverage:fix": "nyc report --temp-dir \"$(pwd)/coverage\" --reporter lcov --report-dir \"$(pwd)/coverage\" --cwd ../..",
+    "coverage": "vitest run --coverage",
     "test:watch": "vitest",
     "test": "vitest run",
     "watch": "tsc -b . -w"
diff --git a/packages/cspell-io/package.json b/packages/cspell-io/package.json
index fab80eae19f..ccfb9a4a0cf 100644
--- a/packages/cspell-io/package.json
+++ b/packages/cspell-io/package.json
@@ -27,9 +27,7 @@
     "watch": "pnpm build:watch",
     "clean": "shx rm -rf dist temp coverage \"*.tsbuildInfo\"",
     "clean-build": "pnpm run clean && pnpm run build",
-    "coverage": "pnpm coverage:vitest && pnpm coverage:fix",
-    "coverage:vitest": "vitest run --coverage",
-    "coverage:fix": "nyc report --temp-dir \"$(pwd)/coverage\" --reporter lcov --report-dir \"$(pwd)/coverage\" --cwd ../..",
+    "coverage": "vitest run --coverage",
     "test-watch": "vitest",
     "test": "vitest run"
   },
diff --git a/packages/cspell-json-reporter/package.json b/packages/cspell-json-reporter/package.json
index e29ffc23a3f..08499b64ea7 100644
--- a/packages/cspell-json-reporter/package.json
+++ b/packages/cspell-json-reporter/package.json
@@ -41,9 +41,7 @@
     "build": "tsc -b . && ts2mjs dist/esm",
     "build:esm": "tsc -p tsconfig.esm.json",
     "clean-build": "pnpm run clean && pnpm run build",
-    "coverage": "pnpm coverage:vitest && pnpm coverage:fix",
-    "coverage:vitest": "vitest run --coverage",
-    "coverage:fix": "nyc report --temp-dir \"$(pwd)/coverage\" --reporter lcov --report-dir \"$(pwd)/coverage\" --cwd ../..",
+    "coverage": "vitest run --coverage",
     "test:watch": "vitest",
     "test": "vitest run",
     "watch": "tsc -b . -w"
diff --git a/packages/cspell-lib/package.json b/packages/cspell-lib/package.json
index b91162471fe..57faaf6054e 100644
--- a/packages/cspell-lib/package.json
+++ b/packages/cspell-lib/package.json
@@ -30,9 +30,7 @@
     "build:esm": "tsc -b tsconfig.esm.json",
     "build:esm:ts2mjs": "tsc -b tsconfig.esm.json && ts2mjs dist/esm",
     "build:lib": "tsc -b src/lib/tsconfig.json",
-    "coverage": "pnpm coverage:vitest && pnpm coverage:fix",
-    "coverage:vitest": "vitest run --coverage",
-    "coverage:fix": "nyc report --temp-dir \"$(pwd)/coverage\" --reporter lcov --report-dir \"$(pwd)/coverage\" --cwd ../..",
+    "coverage": "vitest run --coverage",
     "test-watch": "vitest",
     "prepublishOnly": "pnpm run clean-build",
     "test": "vitest run",
diff --git a/packages/cspell-pipe/package.json b/packages/cspell-pipe/package.json
index aa4618333df..3ca820b404a 100644
--- a/packages/cspell-pipe/package.json
+++ b/packages/cspell-pipe/package.json
@@ -98,9 +98,7 @@
     "watch": "tsc -p . -w",
     "clean": "shx rm -rf dist temp coverage \"*.tsbuildInfo\"",
     "clean-build": "pnpm run clean && pnpm run build",
-    "coverage": "pnpm coverage:vitest && pnpm coverage:fix",
-    "coverage:vitest": "vitest run --coverage",
-    "coverage:fix": "nyc report --temp-dir \"$(pwd)/coverage\" --reporter lcov --report-dir \"$(pwd)/coverage\" --cwd ../..",
+    "coverage": "vitest run --coverage",
     "test-watch": "vitest",
     "test": "vitest run"
   },
diff --git a/packages/cspell-service-bus/package.json b/packages/cspell-service-bus/package.json
index 6c9eacdbee6..11669c83f28 100644
--- a/packages/cspell-service-bus/package.json
+++ b/packages/cspell-service-bus/package.json
@@ -38,9 +38,7 @@
     "watch": "tsc -b . -w",
     "clean": "shx rm -rf dist temp coverage \"*.tsbuildInfo\"",
     "clean-build": "pnpm build:clean",
-    "coverage": "pnpm coverage:vitest && pnpm coverage:fix",
-    "coverage:vitest": "vitest run --coverage",
-    "coverage:fix": "nyc report --temp-dir \"$(pwd)/coverage\" --reporter lcov --report-dir \"$(pwd)/coverage\" --cwd ../..",
+    "coverage": "vitest run --coverage",
     "test-watch": "vitest --watch",
     "test": "vitest run"
   },
diff --git a/packages/cspell-strong-weak-map/package.json b/packages/cspell-strong-weak-map/package.json
index 43241e9db0c..f665abf6514 100644
--- a/packages/cspell-strong-weak-map/package.json
+++ b/packages/cspell-strong-weak-map/package.json
@@ -43,9 +43,7 @@
     "watch": "tsc -b . -w",
     "clean": "shx rm -rf dist temp coverage \"*.tsbuildInfo\"",
     "clean-build": "pnpm run clean && pnpm run build",
-    "coverage": "pnpm coverage:vitest && pnpm coverage:fix",
-    "coverage:vitest": "pnpm vitest run --coverage",
-    "coverage:fix": "nyc report --temp-dir \"$(pwd)/coverage\" --reporter lcov --report-dir \"$(pwd)/coverage\" --cwd ../..",
+    "coverage": "pnpm run vitest run --coverage",
     "test-watch": "pnpm vitest",
     "test": "pnpm vitest run",
     "vitest": "node --expose-gc ../../node_modules/vitest/vitest.mjs"
diff --git a/packages/cspell-tools/package.json b/packages/cspell-tools/package.json
index 093a0f47318..b13cbc9fa57 100644
--- a/packages/cspell-tools/package.json
+++ b/packages/cspell-tools/package.json
@@ -16,8 +16,7 @@
     "watch": "tsc -p . -w",
     "clean-build": "pnpm run clean && pnpm run build",
     "clean": "shx rm -rf dist temp coverage \"*.tsbuildInfo\"",
-    "coverage": "pnpm coverage:vitest",
-    "coverage:vitest": "vitest run --coverage",
+    "coverage": "vitest run --coverage",
     "test:watch": "vitest",
     "test": "vitest run",
     "update-snapshot": "vitest run -u"
diff --git a/packages/cspell-trie-lib/package.json b/packages/cspell-trie-lib/package.json
index a09867f43fc..1f942ba6174 100644
--- a/packages/cspell-trie-lib/package.json
+++ b/packages/cspell-trie-lib/package.json
@@ -26,9 +26,7 @@
     "build:lib": "tsc -b .",
     "build:api": "rollup -c api/rollup.config.mjs",
     "clean-build": "pnpm run clean && pnpm run build",
-    "coverage": "pnpm coverage:vitest && pnpm coverage:fix",
-    "coverage:vitest": "vitest run --coverage",
-    "coverage:fix": "nyc report --temp-dir \"$(pwd)/coverage\" --reporter lcov --report-dir \"$(pwd)/coverage\" --cwd ../..",
+    "coverage": "vitest run --coverage",
     "test:watch": "vitest",
     "test": "vitest run",
     "watch": "tsc -b . -w"
diff --git a/packages/cspell-trie/package.json b/packages/cspell-trie/package.json
index 2db21a5dbb4..b6d233ee035 100644
--- a/packages/cspell-trie/package.json
+++ b/packages/cspell-trie/package.json
@@ -19,9 +19,7 @@
     "clean": "shx rm -rf dist temp coverage \"*.tsbuildInfo\"",
     "build": "tsc -p .",
     "clean-build": "pnpm run clean && pnpm run build",
-    "coverage": "pnpm coverage:vitest && pnpm coverage:fix",
-    "coverage:vitest": "vitest run --coverage",
-    "coverage:fix": "nyc report --temp-dir \"$(pwd)/coverage\" --reporter lcov --report-dir \"$(pwd)/coverage\" --cwd ../..",
+    "coverage": "vitest run --coverage",
     "test-watch": "vitest",
     "test": "vitest run",
     "watch": "tsc -w"
diff --git a/packages/cspell-types/package.json b/packages/cspell-types/package.json
index 4ef84fcb84f..2a2f8df1ebe 100644
--- a/packages/cspell-types/package.json
+++ b/packages/cspell-types/package.json
@@ -52,9 +52,7 @@
     "build:tsc": "tsc -b tsconfig.json && ts2mjs  dist/esm",
     "build-schema": "ts-json-schema-generator --no-top-ref --path src/CSpellSettingsDef.ts --type CSpellSettings --validation-keywords markdownDescription  --validation-keywords scope --validation-keywords deprecated --validation-keywords deprecationMessage -o  ./cspell.schema.json && shx cp ./cspell.schema.json ../..",
     "clean-build": "pnpm run clean && pnpm run build",
-    "coverage": "pnpm coverage:vitest && pnpm coverage:fix",
-    "coverage:vitest": "vitest run --coverage",
-    "coverage:fix": "nyc report --temp-dir \"$(pwd)/coverage\" --reporter lcov --report-dir \"$(pwd)/coverage\" --cwd ../..",
+    "coverage": "vitest run --coverage",
     "test": "pnpm test:unit && pnpm test:schema",
     "test:unit": "vitest run",
     "test:schema": "ajv -s ./cspell.schema.json -d \"cspell.test.{json,yaml}\" -c ./ajv.config.js",
diff --git a/packages/cspell/package.json b/packages/cspell/package.json
index 06789654f67..b268e0c988e 100644
--- a/packages/cspell/package.json
+++ b/packages/cspell/package.json
@@ -51,9 +51,7 @@
     "build:readme:help:lint": "./bin.mjs lint --help > static/help-lint.txt",
     "build:readme:help:trace": "./bin.mjs trace --help > static/help-trace.txt",
     "clean-build": "pnpm run clean && pnpm run build",
-    "coverage": "pnpm coverage:vitest && pnpm coverage:fix",
-    "coverage:vitest": "vitest run --coverage",
-    "coverage:fix": "nyc report --temp-dir \"$(pwd)/coverage\" --reporter lcov --report-dir \"$(pwd)/coverage\" --cwd ../..",
+    "coverage": "vitest run --coverage",
     "test:watch": "vitest",
     "test": "vitest run",
     "watch": "tsc -b . -w",
diff --git a/packages/dynamic-import/package.json b/packages/dynamic-import/package.json
index 863ec3ad305..3f5ebd75a0b 100644
--- a/packages/dynamic-import/package.json
+++ b/packages/dynamic-import/package.json
@@ -39,9 +39,7 @@
     "build": "tsc -b .",
     "build:clean": "shx rm -rf dist coverage && pnpm build",
     "clean-build": "pnpm build:clean",
-    "coverage": "pnpm coverage:vitest && pnpm coverage:fix",
-    "coverage:vitest": "vitest run --coverage",
-    "coverage:fix": "nyc report --temp-dir \"$(pwd)/coverage\" --reporter lcov --report-dir \"$(pwd)/coverage\" --cwd ../..",
+    "coverage": "vitest run --coverage",
     "test-watch": "vitest",
     "test": "vitest run",
     "watch": "tsc -b . --watch"
diff --git a/packages/hunspell-reader/package.json b/packages/hunspell-reader/package.json
index f147eb1dcb5..133f57c9a13 100644
--- a/packages/hunspell-reader/package.json
+++ b/packages/hunspell-reader/package.json
@@ -25,9 +25,7 @@
     "test": "pnpm run test-unit",
     "build": "tsc -p .",
     "clean": "shx rm -rf dist temp coverage \"*.tsbuildInfo\"",
-    "coverage": "pnpm coverage:vitest && pnpm coverage:fix",
-    "coverage:vitest": "vitest run --coverage",
-    "coverage:fix": "nyc report --temp-dir \"$(pwd)/coverage\" --reporter lcov --report-dir \"$(pwd)/coverage\" --cwd ../..",
+    "coverage": "vitest run --coverage",
     "watch": "tsc -w"
   },
   "repository": {