Merge pull request #11414 from keymanapp/chore/web/update-typescript

chore(web): updates TypeScript version to 5.4.5
keymanapp · May 30, 2024 · a3c8daa · a3c8daa
2 parents 65a0c22 + e7b0dd1
commit a3c8daa
Show file tree

Hide file tree

Showing 12 changed files with 406 additions and 119 deletions.
diff --git a/common/models/types/tsconfig.json b/common/models/types/tsconfig.json
@@ -2,7 +2,6 @@
   "extends": "../tsconfig.kmw-worker-base.json",
   "compilerOptions": {
     "declaration": true,
-    "module": "none",
     "outDir": "build/",
   },
   "include": ["./*.ts"],

diff --git a/common/tools/hextobin/package.json b/common/tools/hextobin/package.json
@@ -15,8 +15,5 @@
   "main": "build/index.js",
   "bin": {
     "hextobin": "build/hextobin.js"
-  },
-  "devDependencies": {
-    "@types/node": "^18.7.18"
   }
 }
diff --git a/common/web/gesture-recognizer/src/engine/headless/gestures/matchers/gestureMatcher.ts b/common/web/gesture-recognizer/src/engine/headless/gestures/matchers/gestureMatcher.ts
@@ -81,7 +81,7 @@ export class GestureMatcher<Type, StateToken = any> implements PredecessorMatch<
 
     // We condition on ComplexGestureSource since some unit tests mock the other type without
     // instantiating the actual type.
-    const predecessor = sourceObj instanceof GestureSource<Type> ? null : sourceObj;
+    const predecessor = sourceObj instanceof GestureSource ? null : sourceObj;
     const source = predecessor ? null : (sourceObj as GestureSource<Type>);
 
     this.predecessor = predecessor;

diff --git a/common/web/keyboard-processor/src/keyboards/activeLayout.ts b/common/web/keyboard-processor/src/keyboards/activeLayout.ts
@@ -9,6 +9,7 @@ import type Keyboard from "./keyboard.js";
 import { TouchLayout } from "@keymanapp/common-types";
 import TouchLayoutDefaultHint = TouchLayout.TouchLayoutDefaultHint;
 import TouchLayoutFlick = TouchLayout.TouchLayoutFlick;
+import TouchLayoutKeySp = TouchLayout.TouchLayoutKeySp;
 import { type DeviceSpec } from "@keymanapp/web-utils";
 
 // TS 3.9 changed behavior of getters to make them
@@ -90,7 +91,7 @@ export class ActiveKeyBase {
   layer: string;
   displayLayer: string;
   nextlayer: string;
-  sp?: ButtonClass;
+  sp?: TouchLayoutKeySp;
 
   private _baseKeyEvent: KeyEvent;
   isMnemonic: boolean = false;

diff --git a/common/web/keyboard-processor/src/keyboards/defaultLayouts.ts b/common/web/keyboard-processor/src/keyboards/defaultLayouts.ts
@@ -22,7 +22,7 @@ import type Keyboard from "./keyboard.js";
 export type KLS = {[layerName: string]: string[]};
 
 // The following types provide type definitions for the full JSON format we use for visual keyboard definitions.
-export type ButtonClass       =  0 | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10;
+export type ButtonClass       =  0 | 1 | 2 | 3 | 4 | /*5 | 6 | 7 |*/ 8 | 9 | 10;
 
 export interface LayoutLayer extends LayoutLayerBase {
   // Post-processing elements.

diff --git a/common/web/lm-message-types/tsconfig.json b/common/web/lm-message-types/tsconfig.json
@@ -2,7 +2,6 @@
   "extends": "../../../tsconfig.base.json",
   "compilerOptions": {
     "declaration": true,
-    "module": "none",
     "outDir": "build/",
     "sourceMap": true,
     "lib": ["es6"],

diff --git a/common/web/sentry-manager/src/tsconfig.json b/common/web/sentry-manager/src/tsconfig.json
@@ -1,26 +1,10 @@
 {
-  "extends": "../../../../tsconfig.base.json",
+  "extends": "../../tsconfig.kmw-main-base.json",
   "compilerOptions": {
-
-    // TODO: These override /tsconfig.base.json settings, and so should be removed if possible,
-    //       but existing code in web/ breaks some of these settinsg
-    "noImplicitThis": false,
-    "noImplicitReturns": false,
-    "noImplicitAny": false,
-    "strictFunctionTypes": false,
-    "noUnusedLocals": false,
-
-
-    "allowJs": true,
-    "allowSyntheticDefaultImports": true,
     "baseUrl": "./",
-    "inlineSources": true,
     "lib": ["es6", "dom"],
-    "module": "es6",
     "outDir": "../build/obj",
     "rootDir": "./",
-    "sourceMap": true,
-    "target": "es5",
     "tsBuildInfoFile": "../build/obj/tsconfig.tsbuildinfo",
   },