Skip to content

Commit 5e9c990

Browse files
committed
Fix the errors reported by TypeScript 6.0+
1 parent 5ce15a7 commit 5e9c990

17 files changed

Lines changed: 258 additions & 239 deletions

File tree

package-lock.json

Lines changed: 224 additions & 196 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,20 +6,20 @@
66
"devDependencies": {
77
"@eslint/eslintrc": "^3.3.5",
88
"@eslint/js": "^10.0.1",
9-
"@typescript-eslint/eslint-plugin": "^8.59.4",
10-
"@typescript-eslint/parser": "^8.59.4",
11-
"esbuild": "^0.28.0",
12-
"eslint": "^10.4.0",
9+
"@typescript-eslint/eslint-plugin": "^8.61.1",
10+
"@typescript-eslint/parser": "^8.61.1",
11+
"esbuild": "^0.28.1",
12+
"eslint": "^10.5.0",
1313
"eslint-config-prettier": "^10.1.8",
14-
"prettier": "^3.8.3",
14+
"prettier": "^3.8.4",
1515
"typescript": "^6.0.3"
1616
},
1717
"dependencies": {
18-
"@ckeditor/ckeditor5-inspector": "^5.0.0",
18+
"@ckeditor/ckeditor5-inspector": "^5.0.2",
1919
"@fancyapps/ui": "^6.1.14",
2020
"@googlemaps/markerclusterer": "2.6.2",
2121
"@types/facebook-js-sdk": "^3.3.13",
22-
"@types/google.maps": "^3.64.1",
22+
"@types/google.maps": "^3.65.1",
2323
"@types/grecaptcha": "^3.0.9",
2424
"@types/jquery": "^3.5.33",
2525
"@types/pica": "5.1.3",
@@ -31,7 +31,7 @@
3131
"@woltlab/visual-dom-diff": "git+https://github.com/WoltLab/visual-dom-diff.git#e5b51fce3157d1eda310566fc1f86101341d1fea",
3232
"@woltlab/zxcvbn": "git+https://github.com/WoltLab/zxcvbn.git#5b582b24e437f1883ccad3c37dae7c3c5f1e7da3",
3333
"cropperjs": "2.1.1",
34-
"exifreader": "^4.39.1",
34+
"exifreader": "^4.41.0",
3535
"focus-trap": "^8.2.1",
3636
"hash-wasm": "^4.12.0",
3737
"html-parsed-element": "^0.4.1",

ts/WoltLabSuite/Core/Component/Captcha/Recaptcha.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
/// <reference types="grecaptcha" />
2+
13
/**
24
* Handles Google reCaptcha.
35
*

ts/WoltLabSuite/Core/Component/Ckeditor/Mention.ts

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,6 @@ type Mention = {
1919
icon: string;
2020
};
2121

22-
type MentionFeed = CKEditor5.MentionFeed & {
23-
itemRenderer?: (item: Mention) => HTMLElement | string;
24-
};
25-
2622
async function getPossibleMentions(query: string): Promise<Mention[]> {
2723
// Prevent excessive attempts to resolve mentions.
2824
if (query.length > 24) {
@@ -62,7 +58,7 @@ function getMentionConfiguration(): CKEditor5.MentionConfig {
6258
},
6359
marker: "@",
6460
minimumCharacters: 3,
65-
} as unknown as MentionFeed,
61+
},
6662
],
6763
};
6864
}

ts/WoltLabSuite/Core/Component/GoogleMaps/Geocoding.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
/// <reference types="google.maps" />
2+
13
/**
24
* Provides geocoding functions for searching map locations.
35
*

ts/WoltLabSuite/Core/Component/GoogleMaps/Marker.ts

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ export async function addMarker(
2525
title,
2626
});
2727

28-
if (focus) {
29-
map.setCenter(marker.position!);
28+
if (focus && marker.position !== null && marker.position !== undefined) {
29+
map.setCenter(marker.position);
3030
}
3131
}
3232

@@ -59,7 +59,9 @@ export async function addDraggableMarker(
5959
gmpClickable: false,
6060
});
6161

62-
map.setCenter(marker.position!);
62+
if (marker.position !== null && marker.position !== undefined) {
63+
map.setCenter(marker.position);
64+
}
6365

6466
return marker;
6567
}

ts/WoltLabSuite/Core/Component/GridView/Filter.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ export class Filter extends EventTarget {
2222
super();
2323

2424
this.#filterButton = document.getElementById(`${gridId}_filterButton`) as HTMLButtonElement;
25-
this.#filterPills = document.getElementById(`${gridId}_filters`) as HTMLElement;
25+
this.#filterPills = document.getElementById(`${gridId}_filters`);
2626

2727
this.#setupEventListeners();
2828
}

ts/WoltLabSuite/Core/Component/GridView/Selection.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ export class Selection extends EventTarget {
3232
this.#change(this.#markAll!.checked);
3333
});
3434

35-
this.#selectionBar = document.getElementById(`${gridId}_selectionBar`) as HTMLElement;
35+
this.#selectionBar = document.getElementById(`${gridId}_selectionBar`);
3636
this.#bulkInteractionButton = document.getElementById(`${gridId}_bulkInteractionButton`) as HTMLButtonElement;
3737
this.#bulkInteractionButton?.addEventListener("click", () => {
3838
this.#showBulkInteractionMenu();

ts/WoltLabSuite/Core/Component/ListView/Filter.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ export class Filter extends EventTarget {
2222
super();
2323

2424
this.#filterButton = document.getElementById(`${viewId}_filterButton`) as HTMLButtonElement;
25-
this.#filterPills = document.getElementById(`${viewId}_filters`) as HTMLElement;
25+
this.#filterPills = document.getElementById(`${viewId}_filters`);
2626

2727
this.#setupEventListeners();
2828
}

ts/WoltLabSuite/Core/Component/ListView/Selection.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ export class Selection extends EventTarget {
3232
this.#change(this.#markAll!.checked);
3333
});
3434

35-
this.#selectionBar = document.getElementById(`${viewId}_selectionBar`) as HTMLElement;
35+
this.#selectionBar = document.getElementById(`${viewId}_selectionBar`);
3636
this.#bulkInteractionButton = document.getElementById(`${viewId}_bulkInteractionButton`) as HTMLButtonElement;
3737
this.#bulkInteractionButton?.addEventListener("click", () => {
3838
this.#showBulkInteractionMenu();

0 commit comments

Comments
 (0)