Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(web): updates TypeScript version to 5.4.5 #11414

Merged
merged 6 commits into from
May 30, 2024
Merged

chore(web): updates TypeScript version to 5.4.5 #11414

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
70d06d7
chore(web): updates all KMW-related projects to TS 5.4.5
jahorton May 10, 2024
01fa067
chore(web): centralizes on a single @types/node, as it caused a TS ty…
jahorton May 10, 2024
78d9544
fix(web): Web's sentry-manager tsconfig.json did not properly inherit…
jahorton May 13, 2024
d70463a
chore(web): cleans up one tsconfig setting
jahorton May 13, 2024
2c79db4
chore(web): Merge branch 'master' into chore/web/update-typescript
jahorton May 27, 2024
e7b0dd1
chore(web): cleans out redundant tsconfig setting
jahorton May 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion common/models/types/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
"extends": "../tsconfig.kmw-worker-base.json",
"compilerOptions": {
"declaration": true,
"module": "none",
"outDir": "build/",
},
"include": ["./*.ts"],
Expand Down
3 changes: 0 additions & 3 deletions common/tools/hextobin/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,5 @@
"main": "build/index.js",
"bin": {
"hextobin": "build/hextobin.js"
},
"devDependencies": {
"@types/node": "^18.7.18"
}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I wish there was a way in package.json to clearly document dependencies for a package while hoisting the version requirement to the top level. It's useful documentation to have 😭

}
2 changes: 1 addition & 1 deletion common/web/gesture-recognizer/src/engine/headless/gestures/matchers/gestureMatcher.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
3 changes: 2 additions & 1 deletion common/web/keyboard-processor/src/keyboards/activeLayout.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -90,7 +91,7 @@ export class ActiveKeyBase {
layer: string;
displayLayer: string;
nextlayer: string;
sp?: ButtonClass;
sp?: TouchLayoutKeySp;

private _baseKeyEvent: KeyEvent;
isMnemonic: boolean = false;
Expand Down
2 changes: 1 addition & 1 deletion common/web/keyboard-processor/src/keyboards/defaultLayouts.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
1 change: 0 additions & 1 deletion common/web/lm-message-types/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
"extends": "../../../tsconfig.base.json",
"compilerOptions": {
"declaration": true,
"module": "none",
"outDir": "build/",
"sourceMap": true,
"lib": ["es6"],
Expand Down
18 changes: 1 addition & 17 deletions common/web/sentry-manager/src/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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",
},

Expand Down
Loading
Loading