From 391a8613cf0ab48f3967729ca2ace7a6c31540b9 Mon Sep 17 00:00:00 2001 From: Davide Iadeluca <146922689+DavideIadeluca@users.noreply.github.com> Date: Sun, 27 Oct 2024 00:15:50 +0200 Subject: [PATCH] fix: resolve regression in typing errors (#4097) --- extensions/approval/js/src/@types/shims.d.ts | 3 +++ extensions/flags/js/src/@types/shims.d.ts | 4 ++++ extensions/likes/js/src/@types/shims.d.ts | 2 ++ extensions/lock/js/src/@types/shims.d.ts | 2 ++ extensions/mentions/js/src/@types/shims.d.ts | 4 ++++ extensions/nicknames/js/src/@types/shims.d.ts | 2 ++ extensions/sticky/js/src/@types/shims.d.ts | 2 ++ extensions/suspend/js/src/@types/shims.d.ts | 2 ++ extensions/tags/js/src/@types/shims.d.ts | 6 ++++++ 9 files changed, 27 insertions(+) diff --git a/extensions/approval/js/src/@types/shims.d.ts b/extensions/approval/js/src/@types/shims.d.ts index 0f4135403c..d2558e9810 100644 --- a/extensions/approval/js/src/@types/shims.d.ts +++ b/extensions/approval/js/src/@types/shims.d.ts @@ -1,3 +1,6 @@ +import 'flarum/common/models/Discussion'; +import 'flarum/common/models/Post'; + declare module 'flarum/common/models/Discussion' { export default interface Discussion { isApproved(): boolean; diff --git a/extensions/flags/js/src/@types/shims.d.ts b/extensions/flags/js/src/@types/shims.d.ts index 6fd28d4222..4bfd071b71 100644 --- a/extensions/flags/js/src/@types/shims.d.ts +++ b/extensions/flags/js/src/@types/shims.d.ts @@ -1,3 +1,7 @@ +import 'flarum/common/models/Post'; +import 'flarum/forum/ForumApplication'; +import 'flarum/forum/components/Post'; + import Flag from '../forum/models/Flag'; import FlagListState from '../forum/states/FlagListState'; import Mithril from 'mithril'; diff --git a/extensions/likes/js/src/@types/shims.d.ts b/extensions/likes/js/src/@types/shims.d.ts index 358a273932..517cfbc5b1 100644 --- a/extensions/likes/js/src/@types/shims.d.ts +++ b/extensions/likes/js/src/@types/shims.d.ts @@ -1,3 +1,5 @@ +import 'flarum/common/models/Post'; + import User from 'flarum/common/models/User'; declare module 'flarum/common/models/Post' { diff --git a/extensions/lock/js/src/@types/shims.d.ts b/extensions/lock/js/src/@types/shims.d.ts index 38375c0792..444ee265fd 100644 --- a/extensions/lock/js/src/@types/shims.d.ts +++ b/extensions/lock/js/src/@types/shims.d.ts @@ -1,3 +1,5 @@ +import 'flarum/common/models/Discussion'; + declare module 'flarum/common/models/Discussion' { export default interface Discussion { isLocked(): boolean; diff --git a/extensions/mentions/js/src/@types/shims.d.ts b/extensions/mentions/js/src/@types/shims.d.ts index dcb5c31a49..238f93d033 100644 --- a/extensions/mentions/js/src/@types/shims.d.ts +++ b/extensions/mentions/js/src/@types/shims.d.ts @@ -1,3 +1,7 @@ +import 'flarum/forum/ForumApplication'; +import 'flarum/common/models/User'; +import 'flarum/common/models/Post'; + import MentionFormats from '../forum/mentionables/formats/MentionFormats'; import type BasePost from 'flarum/common/models/Post'; diff --git a/extensions/nicknames/js/src/@types/shims.d.ts b/extensions/nicknames/js/src/@types/shims.d.ts index 145fe8e5a3..d184f9aba1 100644 --- a/extensions/nicknames/js/src/@types/shims.d.ts +++ b/extensions/nicknames/js/src/@types/shims.d.ts @@ -1,3 +1,5 @@ +import 'flarum/common/models/User'; + declare module 'flarum/common/models/User' { export default interface User { canEditNickname(): boolean; diff --git a/extensions/sticky/js/src/@types/shims.d.ts b/extensions/sticky/js/src/@types/shims.d.ts index 1a589e7429..5a9a813717 100644 --- a/extensions/sticky/js/src/@types/shims.d.ts +++ b/extensions/sticky/js/src/@types/shims.d.ts @@ -1,3 +1,5 @@ +import 'flarum/common/models/Discussion'; + declare module 'flarum/common/models/Discussion' { export default interface Discussion { isSticky(): boolean; diff --git a/extensions/suspend/js/src/@types/shims.d.ts b/extensions/suspend/js/src/@types/shims.d.ts index 4cd4d2b6a5..2159812103 100644 --- a/extensions/suspend/js/src/@types/shims.d.ts +++ b/extensions/suspend/js/src/@types/shims.d.ts @@ -1,3 +1,5 @@ +import 'flarum/common/models/User'; + declare module 'flarum/common/models/User' { export default interface User { canSuspend(): boolean; diff --git a/extensions/tags/js/src/@types/shims.d.ts b/extensions/tags/js/src/@types/shims.d.ts index b1056ac770..dffadf50c7 100644 --- a/extensions/tags/js/src/@types/shims.d.ts +++ b/extensions/tags/js/src/@types/shims.d.ts @@ -1,3 +1,9 @@ +import 'flarum/forum/routes'; +import 'flarum/common/Application'; +import 'flarum/common/models/Discussion'; +import 'flarum/forum/components/IndexPage'; +import 'flarum/admin/components/PermissionGrid'; + import type Tag from '../common/models/Tag'; import type TagListState from '../common/states/TagListState';