From bcb2233cfd520bfe45230fa57251cbca1f9d2f77 Mon Sep 17 00:00:00 2001
From: Marc Durdin <marc@durdin.net>
Date: Fri, 6 Oct 2023 12:56:35 +0700
Subject: [PATCH 1/3] chore: ignore types for imported schemas for now

---
 common/web/types/src/schema-validators.ts | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/common/web/types/src/schema-validators.ts b/common/web/types/src/schema-validators.ts
index 07bcc032f1..8b89ca7bfd 100644
--- a/common/web/types/src/schema-validators.ts
+++ b/common/web/types/src/schema-validators.ts
@@ -1,11 +1,28 @@
+//@ts-expect-error
 import kpj from './schemas/kpj.schema.validator.mjs';
+
+//@ts-expect-error
 import kpj90 from './schemas/kpj-9.0.schema.validator.mjs';
+
+//@ts-expect-error
 import kvks from './schemas/kvks.schema.validator.mjs';
+
+//@ts-expect-error
 import ldmlKeyboard3 from './schemas/ldml-keyboard3.schema.validator.mjs';
+
+//@ts-expect-error
 import ldmlKeyboardTest3 from './schemas/ldml-keyboardtest3.schema.validator.mjs';
+
+//@ts-expect-error
 import displayMap from './schemas/displaymap.schema.validator.mjs';
+
+//@ts-expect-error
 import touchLayoutClean from './schemas/keyman-touch-layout.clean.spec.validator.mjs';
+
+//@ts-expect-error
 import touchLayout from './schemas/keyman-touch-layout.spec.validator.mjs';
+
+//@ts-expect-error
 import keyboard_info from './schemas/keyboard_info.schema.validator.mjs';
 
 // How to use: https://ajv.js.org/standalone.html#using-the-validation-function-s

From 928bd2a7cd972584378d993ba9e69744a43bfcff Mon Sep 17 00:00:00 2001
From: Marc Durdin <marc@durdin.net>
Date: Fri, 6 Oct 2023 14:48:28 +0700
Subject: [PATCH 2/3] chore(common): fixup tsconfig for common/web/utils

---
 developer/src/common/web/utils/tsconfig.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/developer/src/common/web/utils/tsconfig.json b/developer/src/common/web/utils/tsconfig.json
index dbb068a7a2..b509561362 100644
--- a/developer/src/common/web/utils/tsconfig.json
+++ b/developer/src/common/web/utils/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../../../tsconfig.esm-base.json",
+  "extends": "../../../../../tsconfig.base.json",
 
   "compilerOptions": {
       "rootDir": ".",

From 00484a0e0f39166dbec2cdff817a2aea62dc025a Mon Sep 17 00:00:00 2001
From: Marc Durdin <marc@durdin.net>
Date: Sat, 7 Oct 2023 06:46:10 +0700
Subject: [PATCH 3/3] chore: fixup js imports for schema validators

---
 common/web/types/src/schema-validators.ts | 17 -----------------
 tsconfig.base.json                        |  1 +
 2 files changed, 1 insertion(+), 17 deletions(-)

diff --git a/common/web/types/src/schema-validators.ts b/common/web/types/src/schema-validators.ts
index 8b89ca7bfd..07bcc032f1 100644
--- a/common/web/types/src/schema-validators.ts
+++ b/common/web/types/src/schema-validators.ts
@@ -1,28 +1,11 @@
-//@ts-expect-error
 import kpj from './schemas/kpj.schema.validator.mjs';
-
-//@ts-expect-error
 import kpj90 from './schemas/kpj-9.0.schema.validator.mjs';
-
-//@ts-expect-error
 import kvks from './schemas/kvks.schema.validator.mjs';
-
-//@ts-expect-error
 import ldmlKeyboard3 from './schemas/ldml-keyboard3.schema.validator.mjs';
-
-//@ts-expect-error
 import ldmlKeyboardTest3 from './schemas/ldml-keyboardtest3.schema.validator.mjs';
-
-//@ts-expect-error
 import displayMap from './schemas/displaymap.schema.validator.mjs';
-
-//@ts-expect-error
 import touchLayoutClean from './schemas/keyman-touch-layout.clean.spec.validator.mjs';
-
-//@ts-expect-error
 import touchLayout from './schemas/keyman-touch-layout.spec.validator.mjs';
-
-//@ts-expect-error
 import keyboard_info from './schemas/keyboard_info.schema.validator.mjs';
 
 // How to use: https://ajv.js.org/standalone.html#using-the-validation-function-s
diff --git a/tsconfig.base.json b/tsconfig.base.json
index 2c56fd7079..7630ddbfc4 100644
--- a/tsconfig.base.json
+++ b/tsconfig.base.json
@@ -12,6 +12,7 @@
     "strictBindCallApply": true,
     "strictFunctionTypes": true,
     "noUnusedLocals": true,
+    "allowJs": true,
 
     "rootDir": ".",