From e2b1a96fcf77041847642f0689644b77f052305e Mon Sep 17 00:00:00 2001
From: Rene Haas <king-sora@hotmail.de>
Date: Fri, 21 Oct 2022 14:38:57 +0200
Subject: [PATCH] codecov verage

---
 .github/codecov.yml                     |  9 ---------
 .github/workflows/test.yml              | 21 +++++++++++----------
 local/config/src/jest.js                |  2 +-
 local/config/src/playwright.coverage.js |  2 +-
 local/config/src/vitest.js              |  2 +-
 package.json                            |  8 +++++---
 6 files changed, 19 insertions(+), 25 deletions(-)

diff --git a/.github/codecov.yml b/.github/codecov.yml
index 90fa8aa..5712e69 100644
--- a/.github/codecov.yml
+++ b/.github/codecov.yml
@@ -7,12 +7,3 @@ coverage:
   status:
     project: off
     patch: off
-
-
-flag_management:
-  default_rules:
-    carryforward: true
-  individual_flags:
-    - name: overlayscrollbars
-      paths:
-        - 'packages/overlayscrollbars/**'
\ No newline at end of file
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 7699433..e009e56 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -21,17 +21,18 @@ jobs:
           node-version: '16'
       - name: Install dependencies
         run: npm ci
-      - name: Run test
-        run: npm run test
-      - name: Run e2e
-        run: xvfb-run npm run e2e
-      - name: Upload Jest Coverage
+      - name: Run Unit Tests
+        run: npm run ci:test
+      - name: Run e2e Tests
+        run: xvfb-run npm run ci:e2e
+      - name: Upload Unit Tests Coverage
         uses: codecov/codecov-action@v3
         with:
-          flags: overlayscrollbars,unit
-          files: "**/overlayscrollbars/**/jest/coverage*.json"
-      - name: Upload Playwright Coverage
+          flags: unit
+          files: "packages/**/.coverage/unit/coverage*.json"
+      - name: Upload e2e Tests Coverage
         uses: codecov/codecov-action@v3
         with:
-          flags: overlayscrollbars,ui
-          files: "**/overlayscrollbars/**/playwright/coverage*.json"
+          flags: e2e
+          files: "packages/**/.coverage/e2e/coverage*.json"
+
diff --git a/local/config/src/jest.js b/local/config/src/jest.js
index 91e399e..f3840ec 100644
--- a/local/config/src/jest.js
+++ b/local/config/src/jest.js
@@ -12,7 +12,7 @@ const assetFilesModuleNameMapper = {
 
 /** @type {import('jest').Config} */
 module.exports = {
-  coverageDirectory: './.coverage/jest',
+  coverageDirectory: './.coverage/unit',
   moduleNameMapper: assetFilesModuleNameMapper,
   projects: [
     {
diff --git a/local/config/src/playwright.coverage.js b/local/config/src/playwright.coverage.js
index 2aaa00f..2594a3b 100644
--- a/local/config/src/playwright.coverage.js
+++ b/local/config/src/playwright.coverage.js
@@ -1,4 +1,4 @@
 module.exports = {
   tmpCoverageDirectory: './.coverage/.nycPlaywright',
-  coverageDirectory: './.coverage/playwright',
+  coverageDirectory: './.coverage/e2e',
 };
diff --git a/local/config/src/vitest.js b/local/config/src/vitest.js
index 9a0b86f..6ceec77 100644
--- a/local/config/src/vitest.js
+++ b/local/config/src/vitest.js
@@ -7,7 +7,7 @@ module.exports = defineConfig({
     environment: 'jsdom',
     include: ['test/**/*.test.{js,mjs,cjs,ts,mts,cts,jsx,tsx}'],
     coverage: {
-      reportsDirectory: './.coverage',
+      reportsDirectory: './.coverage/unit',
     },
   },
 });
diff --git a/package.json b/package.json
index 5c73610..765f96d 100644
--- a/package.json
+++ b/package.json
@@ -60,13 +60,13 @@
     "webpack": "^5.74.0"
   },
   "scripts": {
-    "test": "run-p test:*",
+    "test": "run-s test:*",
     "test:os": "npm run test --workspace=overlayscrollbars",
     "test:react": "npm run test --workspace=overlayscrollbars-react",
     "test:vue": "npm run test --workspace=overlayscrollbars-vue",
     "test:ngx": "npm run test --workspace=overlayscrollbars-ngx",
     "test:svelte": "npm run test --workspace=overlayscrollbars-svelte",
-    "e2e": "run-p e2e:*",
+    "e2e": "run-s e2e:*",
     "e2e:os": "npm run e2e --workspace=overlayscrollbars",
     "e2e:os:dev": "npm run e2e:dev --workspace=overlayscrollbars",
     "build": "run-p build:*",
@@ -82,6 +82,8 @@
     "lint": "eslint ./packages/**/{src,test}/**/*.{js,jsx,ts,tsx}",
     "lint:fix": "eslint --fix ./packages/**/{src,test}/**/*.{js,jsx,ts,tsx}",
     "prettier": "prettier --check ./packages/**/{src,test}/**/*.{js,jsx,ts,tsx}",
-    "prettier:fix": "prettier --write ./packages/**/{src,test}/**/*.{js,jsx,ts,tsx}"
+    "prettier:fix": "prettier --write ./packages/**/{src,test}/**/*.{js,jsx,ts,tsx}",
+    "ci:test": "run-p test:*",
+    "ci:e2e": "run-p e2e:*"
   }
 }