From 69cd317cd810ca0a39f4af683ae0c1c8e2657609 Mon Sep 17 00:00:00 2001
From: "Dr Mark C. Sinclair" <markcsinclair@gmail.com>
Date: Mon, 9 Dec 2024 14:47:18 +0000
Subject: [PATCH 1/2] chore(common/web): remove .c8rc.json from types and merge
 exclusions into package.json

---
 common/web/types/.c8rc.json   | 12 ------------
 common/web/types/package.json |  8 +++++++-
 2 files changed, 7 insertions(+), 13 deletions(-)
 delete mode 100644 common/web/types/.c8rc.json

diff --git a/common/web/types/.c8rc.json b/common/web/types/.c8rc.json
deleted file mode 100644
index f7137ed999b..00000000000
--- a/common/web/types/.c8rc.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "exclude": [
-    "src/keyboard-object.ts",
-    "src/lexical-model-types.ts",
-    "src/outputTarget.interface.ts",
-    "src/*.d.ts",
-    "src/main.ts",
-    "src/schemas/*",
-    "src/schema-validators.ts",
-    "src/schemas.ts"
-  ]
-}
diff --git a/common/web/types/package.json b/common/web/types/package.json
index d6efc635039..429dfbcddbb 100644
--- a/common/web/types/package.json
+++ b/common/web/types/package.json
@@ -76,7 +76,13 @@
       "src/keyman-touch-layout/keyman-touch-layout-file-writer.ts",
       "src/osk/osk.ts",
       "src/schemas/*",
-      "tests/"
+      "tests/",
+      "src/keyboard-object.ts",
+      "src/outputTarget.interface.ts",
+      "src/*.d.ts",
+      "src/main.ts",
+      "src/schema-validators.ts",
+      "src/schemas.ts"
     ]
   },
   "sideEffects": false

From 3289b31b72f889e7c91f55c623e971a73c3d51d4 Mon Sep 17 00:00:00 2001
From: "Dr Mark C. Sinclair" <markcsinclair@gmail.com>
Date: Tue, 10 Dec 2024 10:14:47 +0000
Subject: [PATCH 2/2] chore(common/web): updated comment in build.sh to note
 excludes are in package.json

---
 common/web/types/build.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/web/types/build.sh b/common/web/types/build.sh
index 418840d1a85..597962aeee8 100755
--- a/common/web/types/build.sh
+++ b/common/web/types/build.sh
@@ -92,7 +92,7 @@ function do_test() {
 
   readonly C8_THRESHOLD=60
 
-  # Excludes are defined in .c8rc.json
+  # Excludes are defined in package.json
   c8 -skip-full --reporter=lcov --reporter=text --lines $C8_THRESHOLD --statements $C8_THRESHOLD --branches $C8_THRESHOLD --functions $C8_THRESHOLD mocha ${MOCHA_FLAGS} "${builder_extra_params[@]}"
   builder_echo warning "Coverage thresholds are currently $C8_THRESHOLD%, which is lower than ideal."
   builder_echo warning "Please increase threshold in build.sh as test coverage improves."