From 3bfd3678322ebcad5a529b2793250c6240913702 Mon Sep 17 00:00:00 2001 From: Davide Iadeluca Date: Wed, 10 Jul 2024 12:43:39 +0200 Subject: [PATCH 01/15] chore(emoji): export missing modules in compat API --- extensions/emoji/js/src/forum/compat.ts | 7 +++++++ extensions/emoji/js/src/forum/index.js | 6 ++++++ 2 files changed, 13 insertions(+) create mode 100644 extensions/emoji/js/src/forum/compat.ts diff --git a/extensions/emoji/js/src/forum/compat.ts b/extensions/emoji/js/src/forum/compat.ts new file mode 100644 index 0000000000..c797bb17b9 --- /dev/null +++ b/extensions/emoji/js/src/forum/compat.ts @@ -0,0 +1,7 @@ +import AutocompleteDropdown from './fragments/AutocompleteDropdown'; +import getEmojiIconCode from './helpers/getEmojiIconCode'; + +export default { + 'emoji/fragments/AutocompleteDropdown': AutocompleteDropdown, + 'emoji/helpers/getEmojiIconCode': getEmojiIconCode, +}; diff --git a/extensions/emoji/js/src/forum/index.js b/extensions/emoji/js/src/forum/index.js index c8478c44c7..6c7d6fe7e7 100644 --- a/extensions/emoji/js/src/forum/index.js +++ b/extensions/emoji/js/src/forum/index.js @@ -11,3 +11,9 @@ app.initializers.add('flarum-emoji', () => { // render emoji as image in Posts content and title. renderEmoji(); }); + +// Expose compat API +import emojiCompat from './compat'; +import { compat } from '@flarum/core/forum'; + +Object.assign(compat, emojiCompat); From d6876633433055cf978dbe5f7bc5f0298c99223d Mon Sep 17 00:00:00 2001 From: Davide Iadeluca Date: Wed, 10 Jul 2024 12:43:53 +0200 Subject: [PATCH 02/15] chore(flags): export missing modules in compat API --- extensions/flags/js/src/forum/compat.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/extensions/flags/js/src/forum/compat.js b/extensions/flags/js/src/forum/compat.js index 5365edd445..1be1efcdd3 100644 --- a/extensions/flags/js/src/forum/compat.js +++ b/extensions/flags/js/src/forum/compat.js @@ -6,6 +6,7 @@ import FlagList from './components/FlagList'; import FlagPostModal from './components/FlagPostModal'; import FlagsPage from './components/FlagsPage'; import FlagsDropdown from './components/FlagsDropdown'; +import FlagListState from './states/FlagListState'; export default { 'flags/addFlagsToPosts': addFlagsToPosts, @@ -16,4 +17,5 @@ export default { 'flags/components/FlagPostModal': FlagPostModal, 'flags/components/FlagsPage': FlagsPage, 'flags/components/FlagsDropdown': FlagsDropdown, + 'flags/states/FlagListState': FlagListState, }; From c883bdbb60c2462ffad15570db2c901675a3f1c6 Mon Sep 17 00:00:00 2001 From: Davide Iadeluca Date: Wed, 10 Jul 2024 12:44:07 +0200 Subject: [PATCH 03/15] chore(likes): export missing modules in compat API --- extensions/likes/js/src/forum/compat.ts | 11 +++++++++++ extensions/likes/js/src/forum/index.js | 6 ++++++ 2 files changed, 17 insertions(+) create mode 100644 extensions/likes/js/src/forum/compat.ts diff --git a/extensions/likes/js/src/forum/compat.ts b/extensions/likes/js/src/forum/compat.ts new file mode 100644 index 0000000000..3e19869258 --- /dev/null +++ b/extensions/likes/js/src/forum/compat.ts @@ -0,0 +1,11 @@ +import LikesUserPage from './components/LikesUserPage'; +import PostLikedNotification from './components/PostLikedNotification'; +import PostLikesModal from './components/PostLikesModal'; +import PostLikesModalState from './states/PostLikesModalState'; + +export default { + 'likes/components/LikesUserPage': LikesUserPage, + 'likes/components/PostLikedNotification': PostLikedNotification, + 'likes/components/PostLikesModal': PostLikesModal, + 'likes/states/PostLikesModalState': PostLikesModalState, +}; diff --git a/extensions/likes/js/src/forum/index.js b/extensions/likes/js/src/forum/index.js index 29d7a1d653..2fb14404f6 100644 --- a/extensions/likes/js/src/forum/index.js +++ b/extensions/likes/js/src/forum/index.js @@ -24,3 +24,9 @@ app.initializers.add('flarum-likes', () => { }); }); }); + +// Expose compat API +import likesCompat from './compat'; +import { compat } from '@flarum/core/forum'; + +Object.assign(compat, likesCompat); From ee14ca5f2db70f1c7ab087571660634b96d7a137 Mon Sep 17 00:00:00 2001 From: Davide Iadeluca Date: Wed, 10 Jul 2024 12:44:14 +0200 Subject: [PATCH 04/15] chore(lock): export missing modules in compat API --- extensions/lock/js/src/forum/compat.ts | 7 +++++++ extensions/lock/js/src/forum/index.js | 6 ++++++ 2 files changed, 13 insertions(+) create mode 100644 extensions/lock/js/src/forum/compat.ts diff --git a/extensions/lock/js/src/forum/compat.ts b/extensions/lock/js/src/forum/compat.ts new file mode 100644 index 0000000000..240aa91d20 --- /dev/null +++ b/extensions/lock/js/src/forum/compat.ts @@ -0,0 +1,7 @@ +import DiscussionLockedNotification from './components/DiscussionLockedNotification'; +import DiscussionLockedPost from './components/DiscussionLockedPost'; + +export default { + 'lock/components/DiscussionLockedNotification': DiscussionLockedNotification, + 'lock/components/DiscussionLockedPost': DiscussionLockedPost, +}; diff --git a/extensions/lock/js/src/forum/index.js b/extensions/lock/js/src/forum/index.js index 0ac405d3cf..1d9a557ef9 100644 --- a/extensions/lock/js/src/forum/index.js +++ b/extensions/lock/js/src/forum/index.js @@ -22,3 +22,9 @@ app.initializers.add('flarum-lock', () => { }); }); }); + +// Expose compat API +import lockCompat from './compat'; +import { compat } from '@flarum/core/forum'; + +Object.assign(compat, lockCompat); From 68e64a3a48c30607d81cdd5313e9cfe0368717ba Mon Sep 17 00:00:00 2001 From: Davide Iadeluca Date: Wed, 10 Jul 2024 12:44:45 +0200 Subject: [PATCH 05/15] chore(markdown): export missing modules in compat API --- extensions/markdown/js/src/admin/compat.ts | 5 +++++ extensions/markdown/js/src/admin/index.js | 6 ++++++ extensions/markdown/js/src/common/compat.ts | 7 +++++++ extensions/markdown/js/src/forum/compat.ts | 5 +++++ extensions/markdown/js/src/forum/index.js | 6 ++++++ 5 files changed, 29 insertions(+) create mode 100644 extensions/markdown/js/src/admin/compat.ts create mode 100644 extensions/markdown/js/src/common/compat.ts create mode 100644 extensions/markdown/js/src/forum/compat.ts diff --git a/extensions/markdown/js/src/admin/compat.ts b/extensions/markdown/js/src/admin/compat.ts new file mode 100644 index 0000000000..426818c2be --- /dev/null +++ b/extensions/markdown/js/src/admin/compat.ts @@ -0,0 +1,5 @@ +import commonCompat from '../common/compat'; + +export default { + ...commonCompat, +}; diff --git a/extensions/markdown/js/src/admin/index.js b/extensions/markdown/js/src/admin/index.js index e655c3e4cf..c315325fa0 100644 --- a/extensions/markdown/js/src/admin/index.js +++ b/extensions/markdown/js/src/admin/index.js @@ -2,3 +2,9 @@ import app from 'flarum/admin/app'; import { initialize } from '../common/index'; app.initializers.add('flarum-markdown', initialize); + +// Expose compat API +import markdownCompat from './compat'; +import { compat } from '@flarum/core/admin'; + +Object.assign(compat, markdownCompat); diff --git a/extensions/markdown/js/src/common/compat.ts b/extensions/markdown/js/src/common/compat.ts new file mode 100644 index 0000000000..cc005d2903 --- /dev/null +++ b/extensions/markdown/js/src/common/compat.ts @@ -0,0 +1,7 @@ +import MarkdownButton from './components/MarkdownButton'; +import MarkdownToolbar from './components/MarkdownToolbar'; + +export default { + 'markdown/components/MarkdownButton': MarkdownButton, + 'markdown/components/MarkdownToolbar': MarkdownToolbar, +}; diff --git a/extensions/markdown/js/src/forum/compat.ts b/extensions/markdown/js/src/forum/compat.ts new file mode 100644 index 0000000000..426818c2be --- /dev/null +++ b/extensions/markdown/js/src/forum/compat.ts @@ -0,0 +1,5 @@ +import commonCompat from '../common/compat'; + +export default { + ...commonCompat, +}; diff --git a/extensions/markdown/js/src/forum/index.js b/extensions/markdown/js/src/forum/index.js index b38d9916e3..d2d652f39f 100644 --- a/extensions/markdown/js/src/forum/index.js +++ b/extensions/markdown/js/src/forum/index.js @@ -2,3 +2,9 @@ import app from 'flarum/forum/app'; import { initialize } from '../common/index'; app.initializers.add('flarum-markdown', initialize); + +// Expose compat API +import markdownCompat from './compat'; +import { compat } from '@flarum/core/forum'; + +Object.assign(compat, markdownCompat); From 4531fbff20643cce9d35fab95423e85497ec445e Mon Sep 17 00:00:00 2001 From: Davide Iadeluca Date: Wed, 10 Jul 2024 12:45:13 +0200 Subject: [PATCH 06/15] chore(mentions): export missing modules in compat API --- extensions/mentions/js/src/forum/compat.js | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/extensions/mentions/js/src/forum/compat.js b/extensions/mentions/js/src/forum/compat.js index 8c456f1894..fdb2ba95b9 100644 --- a/extensions/mentions/js/src/forum/compat.js +++ b/extensions/mentions/js/src/forum/compat.js @@ -1,4 +1,6 @@ import GroupMentionedNotification from './components/GroupMentionedNotification'; +import MentionedByModal from './components/MentionedByModal'; +import MentionsDropdownItem from './components/MentionsDropdownItem'; import MentionsUserPage from './components/MentionsUserPage'; import PostMentionedNotification from './components/PostMentionedNotification'; import UserMentionedNotification from './components/UserMentionedNotification'; @@ -9,13 +11,24 @@ import getMentionText from './utils/getMentionText'; import * as reply from './utils/reply'; import selectedText from './utils/selectedText'; import * as textFormatter from './utils/textFormatter'; +import GroupMention from './mentionables/GroupMention'; import MentionableModel from './mentionables/MentionableModel'; +import MentionableModels from './mentionables/MentionableModels'; +import PostMention from './mentionables/PostMention'; +import TagMention from './mentionables/TagMention'; +import UserMention from './mentionables/UserMention'; +import AtMentionFormat from './mentionables/formats/AtMentionFormat'; +import HashMentionFormat from './mentionables/formats/HashMentionFormat'; import MentionFormat from './mentionables/formats/MentionFormat'; +import MentionFormats from './mentionables/formats/MentionFormats'; import Mentionables from './extenders/Mentionables'; +import MentionedByModalState from './state/MentionedByModalState'; export default { 'mentions/components/MentionsUserPage': MentionsUserPage, 'mentions/components/PostMentionedNotification': PostMentionedNotification, + 'mentions/components/MentionedByModal': MentionedByModal, + 'mentions/components/MentionsDropdownItem': MentionsDropdownItem, 'mentions/components/UserMentionedNotification': UserMentionedNotification, 'mentions/components/GroupMentionedNotification': GroupMentionedNotification, 'mentions/fragments/AutocompleteDropdown': AutocompleteDropdown, @@ -25,7 +38,16 @@ export default { 'mentions/utils/reply': reply, 'mentions/utils/selectedText': selectedText, 'mentions/utils/textFormatter': textFormatter, + 'mentions/mentionables/GroupMention': GroupMention, 'mentions/mentionables/MentionableModel': MentionableModel, + 'mentions/mentionables/MentionableModels': MentionableModels, + 'mentions/mentionables/PostMention': PostMention, + 'mentions/mentionables/TagMention': TagMention, + 'mentions/mentionables/UserMention': UserMention, + 'mentions/mentionables/formats/AtMentionFormat': AtMentionFormat, + 'mentions/mentionables/formats/HashMentionFormat': HashMentionFormat, 'mentions/mentionables/formats/MentionFormat': MentionFormat, + 'mentions/mentionables/formats/MentionFormats': MentionFormats, 'mentions/extenders/Mentionables': Mentionables, + 'mentions/state/MentionedByModalState': MentionedByModalState, }; From 67539f50d0b82009524a0f92db158ce986351ae9 Mon Sep 17 00:00:00 2001 From: Davide Iadeluca Date: Wed, 10 Jul 2024 12:45:30 +0200 Subject: [PATCH 07/15] chore(nicknames): export missing modules in compat API --- extensions/nicknames/js/src/forum/compat.ts | 5 +++++ extensions/nicknames/js/src/forum/index.js | 6 ++++++ 2 files changed, 11 insertions(+) create mode 100644 extensions/nicknames/js/src/forum/compat.ts diff --git a/extensions/nicknames/js/src/forum/compat.ts b/extensions/nicknames/js/src/forum/compat.ts new file mode 100644 index 0000000000..3029d0f1a4 --- /dev/null +++ b/extensions/nicknames/js/src/forum/compat.ts @@ -0,0 +1,5 @@ +import NicknameModal from './components/NicknameModal'; + +export default { + 'nicknames/components/NicknameModal': NicknameModal, +}; diff --git a/extensions/nicknames/js/src/forum/index.js b/extensions/nicknames/js/src/forum/index.js index 8c353494cc..4d35fe7d60 100644 --- a/extensions/nicknames/js/src/forum/index.js +++ b/extensions/nicknames/js/src/forum/index.js @@ -110,3 +110,9 @@ app.initializers.add('flarum/nicknames', () => { } }); }); + +// Expose compat API +import nicknamesCompat from './compat'; +import { compat } from '@flarum/core/forum'; + +Object.assign(compat, nicknamesCompat); From a395ddc8d0d7a574045e72822e6368babc2d0f60 Mon Sep 17 00:00:00 2001 From: Davide Iadeluca Date: Wed, 10 Jul 2024 12:46:11 +0200 Subject: [PATCH 08/15] chore(extension-manager): export missing modules in compat API --- .../package-manager/js/src/admin/compat.ts | 52 +++++++++++++++++++ .../package-manager/js/src/admin/index.tsx | 6 +++ 2 files changed, 58 insertions(+) create mode 100644 extensions/package-manager/js/src/admin/compat.ts diff --git a/extensions/package-manager/js/src/admin/compat.ts b/extensions/package-manager/js/src/admin/compat.ts new file mode 100644 index 0000000000..c4ae103985 --- /dev/null +++ b/extensions/package-manager/js/src/admin/compat.ts @@ -0,0 +1,52 @@ +import AuthMethodModal from './components/AuthMethodModal'; +import ConfigureAuth from './components/ConfigureAuth'; +import ConfigureComposer from './components/ConfigureComposer'; +import ConfigureJson from './components/ConfigureJson'; +import ControlSection from './components/ControlSection'; +import ExtensionItem from './components/ExtensionItem'; +import Installer from './components/Installer'; +import Label from './components/Label'; +import MajorUpdater from './components/MajorUpdater'; +import Pagination from './components/Pagination'; +import QueueSection from './components/QueueSection'; +import RepositoryModal from './components/RepositoryModal'; +import SettingsPage from './components/SettingsPage'; +import TaskOutputModal from './components/TaskOutputModal'; +import Updater from './components/Updater'; +import WhyNotModal from './components/WhyNotModal'; + +import Task from './models/Task'; + +import ControlSectionState from './states/ControlSectionState'; +import ExtensionManagerState from './states/ExtensionManagerState'; +import QueueState from './states/QueueState'; + +import errorHandler from './utils/errorHandler'; +import humanDuration from './utils/humanDuration'; +import jumpToQueue from './utils/jumpToQueue'; + +export default { + 'extension-manager/components/AuthMethodModal': AuthMethodModal, + 'extension-manager/components/ConfigureAuth': ConfigureAuth, + 'extension-manager/components/ConfigureComposer': ConfigureComposer, + 'extension-manager/components/ConfigureJson': ConfigureJson, + 'extension-manager/components/ControlSection': ControlSection, + 'extension-manager/components/ExtensionItem': ExtensionItem, + 'extension-manager/components/Installer': Installer, + 'extension-manager/components/Label': Label, + 'extension-manager/components/MajorUpdater': MajorUpdater, + 'extension-manager/components/Pagination': Pagination, + 'extension-manager/components/QueueSection': QueueSection, + 'extension-manager/components/RepositoryModal': RepositoryModal, + 'extension-manager/components/SettingsPage': SettingsPage, + 'extension-manager/components/TaskOutputModal': TaskOutputModal, + 'extension-manager/components/Updater': Updater, + 'extension-manager/components/WhyNotModal': WhyNotModal, + 'extension-manager/models/Task': Task, + 'extension-manager/states/ControlSectionState': ControlSectionState, + 'extension-manager/states/ExtensionManagerState': ExtensionManagerState, + 'extension-manager/states/QueueState': QueueState, + 'extension-manager/utils/errorHandler': errorHandler, + 'extension-manager/utils/humanDuration': humanDuration, + 'extension-manager/utils/jumpToQueue': jumpToQueue, +}; diff --git a/extensions/package-manager/js/src/admin/index.tsx b/extensions/package-manager/js/src/admin/index.tsx index 0219c91cef..12bd79ce96 100755 --- a/extensions/package-manager/js/src/admin/index.tsx +++ b/extensions/package-manager/js/src/admin/index.tsx @@ -82,3 +82,9 @@ app.initializers.add('flarum-extension-manager', (app) => { ); }); }); + +// Expose compat API +import packageManagerCompat from './compat'; +import { compat } from '@flarum/core/admin'; + +Object.assign(compat, packageManagerCompat); From 34072a69154de6acffd1e9bb52c65c038fb522f1 Mon Sep 17 00:00:00 2001 From: Davide Iadeluca Date: Wed, 10 Jul 2024 12:46:25 +0200 Subject: [PATCH 09/15] chore(statistics): export missing modules in compat API --- extensions/statistics/js/src/admin/compat.ts | 11 +++++++++++ extensions/statistics/js/src/admin/index.tsx | 6 ++++++ 2 files changed, 17 insertions(+) create mode 100644 extensions/statistics/js/src/admin/compat.ts diff --git a/extensions/statistics/js/src/admin/compat.ts b/extensions/statistics/js/src/admin/compat.ts new file mode 100644 index 0000000000..7edce73909 --- /dev/null +++ b/extensions/statistics/js/src/admin/compat.ts @@ -0,0 +1,11 @@ +import MiniStatisticsWidget from './components/MiniStatisticsWidget'; +import StatisticsPage from './components/StatisticsPage'; +import StatisticsWidget from './components/StatisticsWidget'; +import StatisticsWidgetDateSelectionModal from './components/StatisticsWidgetDateSelectionModal'; + +export default { + 'statistics/components/MiniStatisticsWidget': MiniStatisticsWidget, + 'statistics/components/StatisticsPage': StatisticsPage, + 'statistics/components/StatisticsWidget': StatisticsWidget, + 'statistics/components/StatisticsWidgetDateSelectionModal': StatisticsWidgetDateSelectionModal, +}; diff --git a/extensions/statistics/js/src/admin/index.tsx b/extensions/statistics/js/src/admin/index.tsx index e2886c1e54..6dc4f42e75 100644 --- a/extensions/statistics/js/src/admin/index.tsx +++ b/extensions/statistics/js/src/admin/index.tsx @@ -13,3 +13,9 @@ app.initializers.add('flarum-statistics', () => { app.extensionData.for('flarum-statistics').registerPage(StatisticsPage); }); + +// Expose compat API +import statisticsCompat from './compat'; +import { compat } from '@flarum/core/admin'; + +Object.assign(compat, statisticsCompat); From ad8108b35753d274c5b382f75788b94a05226c6b Mon Sep 17 00:00:00 2001 From: Davide Iadeluca Date: Wed, 10 Jul 2024 12:46:31 +0200 Subject: [PATCH 10/15] chore(sticky): export missing modules in compat API --- extensions/sticky/js/src/forum/compat.ts | 5 +++++ extensions/sticky/js/src/forum/index.js | 6 ++++++ 2 files changed, 11 insertions(+) create mode 100644 extensions/sticky/js/src/forum/compat.ts diff --git a/extensions/sticky/js/src/forum/compat.ts b/extensions/sticky/js/src/forum/compat.ts new file mode 100644 index 0000000000..4b3566fda4 --- /dev/null +++ b/extensions/sticky/js/src/forum/compat.ts @@ -0,0 +1,5 @@ +import DiscussionStickiedPost from './components/DiscussionStickiedPost'; + +export default { + 'sticky/components/DiscussionStickiedPost': DiscussionStickiedPost, +}; diff --git a/extensions/sticky/js/src/forum/index.js b/extensions/sticky/js/src/forum/index.js index be902a403b..e930c6cee6 100644 --- a/extensions/sticky/js/src/forum/index.js +++ b/extensions/sticky/js/src/forum/index.js @@ -13,3 +13,9 @@ app.initializers.add('flarum-sticky', () => { addStickyExcerpt(); addStickyClass(); }); + +// Expose compat API +import stickyCompat from './compat'; +import { compat } from '@flarum/core/forum'; + +Object.assign(compat, stickyCompat); From ca59dca82426df924a741751432a5e545178245a Mon Sep 17 00:00:00 2001 From: Davide Iadeluca Date: Wed, 10 Jul 2024 12:46:42 +0200 Subject: [PATCH 11/15] chore(subscriptions): export missing modules in compat API --- extensions/subscriptions/js/src/forum/compat.ts | 9 +++++++++ extensions/subscriptions/js/src/forum/index.js | 6 ++++++ 2 files changed, 15 insertions(+) create mode 100644 extensions/subscriptions/js/src/forum/compat.ts diff --git a/extensions/subscriptions/js/src/forum/compat.ts b/extensions/subscriptions/js/src/forum/compat.ts new file mode 100644 index 0000000000..7f9d37100e --- /dev/null +++ b/extensions/subscriptions/js/src/forum/compat.ts @@ -0,0 +1,9 @@ +import NewPostNotification from './components/NewPostNotification'; +import SubscriptionMenu from './components/SubscriptionMenu'; +import SubscriptionMenuItem from './components/SubscriptionMenuItem'; + +export default { + 'subscriptions/components/NewPostNotification': NewPostNotification, + 'subscriptions/components/SubscriptionMenu': SubscriptionMenu, + 'subscriptions/components/SubscriptionMenuItem': SubscriptionMenuItem, +}; diff --git a/extensions/subscriptions/js/src/forum/index.js b/extensions/subscriptions/js/src/forum/index.js index 181fa4dc96..485f07d59f 100644 --- a/extensions/subscriptions/js/src/forum/index.js +++ b/extensions/subscriptions/js/src/forum/index.js @@ -29,3 +29,9 @@ app.initializers.add('subscriptions', function () { }); }); }); + +// Expose compat API +import subscriptionsCompat from './compat'; +import { compat } from '@flarum/core/forum'; + +Object.assign(compat, subscriptionsCompat); From 7102f7a7c5f972efbf4a603e489ee3e03b8f091a Mon Sep 17 00:00:00 2001 From: Davide Iadeluca Date: Wed, 10 Jul 2024 12:46:52 +0200 Subject: [PATCH 12/15] chore(suspend): export missing modules in compat API --- extensions/suspend/js/src/forum/compat.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/extensions/suspend/js/src/forum/compat.js b/extensions/suspend/js/src/forum/compat.js index f1931b7c38..a0fb9a7051 100644 --- a/extensions/suspend/js/src/forum/compat.js +++ b/extensions/suspend/js/src/forum/compat.js @@ -2,6 +2,7 @@ import SuspendUserModal from './components/SuspendUserModal'; import SuspensionInfoModal from './components/SuspensionInfoModal'; import UserSuspendedNotification from './components/UserSuspendedNotification'; import UserUnsuspendedNotification from './components/UserUnsuspendedNotification'; +import * as suspensionHelper from './helpers/suspensionHelper'; import checkForSuspension from './checkForSuspension'; export default { @@ -9,5 +10,6 @@ export default { 'suspend/components/suspensionInfoModal': SuspensionInfoModal, 'suspend/components/UserSuspendedNotification': UserSuspendedNotification, 'suspend/components/UserUnsuspendedNotification': UserUnsuspendedNotification, + 'suspend/helpers/suspensionHelper': suspensionHelper, 'suspend/checkForSuspension': checkForSuspension, }; From 5b95b06ba235a3ef8ae4918a35ae0e59a1f37954 Mon Sep 17 00:00:00 2001 From: Davide Iadeluca Date: Wed, 10 Jul 2024 12:47:00 +0200 Subject: [PATCH 13/15] chore(tags): export missing modules in compat API --- extensions/tags/js/src/admin/compat.js | 2 ++ extensions/tags/js/src/forum/compat.js | 2 ++ 2 files changed, 4 insertions(+) diff --git a/extensions/tags/js/src/admin/compat.js b/extensions/tags/js/src/admin/compat.js index 025584d94d..89ed2d8b00 100644 --- a/extensions/tags/js/src/admin/compat.js +++ b/extensions/tags/js/src/admin/compat.js @@ -4,6 +4,7 @@ import addTagsHomePageOption from './addTagsHomePageOption'; import addTagChangePermission from './addTagChangePermission'; import TagsPage from './components/TagsPage'; import EditTagModal from './components/EditTagModal'; +import SelectTagsSettingComponent from './components/SelectTagsSettingComponent'; import addTagPermission from './addTagPermission'; import addTagsPermissionScope from './addTagsPermissionScope'; @@ -12,6 +13,7 @@ export default Object.assign(compat, { 'tags/addTagChangePermission': addTagChangePermission, 'tags/components/TagsPage': TagsPage, 'tags/components/EditTagModal': EditTagModal, + 'tags/components/SelectTagsSettingComponent': SelectTagsSettingComponent, 'tags/addTagPermission': addTagPermission, 'tags/addTagsPermissionScope': addTagsPermissionScope, }); diff --git a/extensions/tags/js/src/forum/compat.js b/extensions/tags/js/src/forum/compat.js index 7059c27e08..bee94ca4f1 100644 --- a/extensions/tags/js/src/forum/compat.js +++ b/extensions/tags/js/src/forum/compat.js @@ -5,6 +5,7 @@ import addTagControl from './addTagControl'; import TagHero from './components/TagHero'; import TagDiscussionModal from './components/TagDiscussionModal'; import TagsPage from './components/TagsPage'; +import ToggleButton from './components/ToggleButton'; import DiscussionTaggedPost from './components/DiscussionTaggedPost'; import TagLinkButton from './components/TagLinkButton'; import addTagList from './addTagList'; @@ -18,6 +19,7 @@ export default Object.assign(compat, { 'tags/components/TagHero': TagHero, 'tags/components/TagDiscussionModal': TagDiscussionModal, 'tags/components/TagsPage': TagsPage, + 'tags/components/ToggleButton': ToggleButton, 'tags/components/DiscussionTaggedPost': DiscussionTaggedPost, 'tags/components/TagLinkButton': TagLinkButton, 'tags/addTagList': addTagList, From 68897d011c7d75919539a108a897b225d08165c8 Mon Sep 17 00:00:00 2001 From: Davide Iadeluca Date: Thu, 11 Jul 2024 06:59:35 +0200 Subject: [PATCH 14/15] chore(core): export missing modules in compat API --- framework/core/js/src/admin/compat.ts | 8 ++++++++ framework/core/js/src/common/compat.ts | 12 ++++++++++++ framework/core/js/src/forum/compat.ts | 2 ++ 3 files changed, 22 insertions(+) diff --git a/framework/core/js/src/admin/compat.ts b/framework/core/js/src/admin/compat.ts index 0121321425..4b6bd6e635 100644 --- a/framework/core/js/src/admin/compat.ts +++ b/framework/core/js/src/admin/compat.ts @@ -15,6 +15,7 @@ import ExtensionsWidget from './components/ExtensionsWidget'; import HeaderSecondary from './components/HeaderSecondary'; import SettingsModal from './components/SettingsModal'; import DashboardWidget from './components/DashboardWidget'; +import DebugWarningWidget from './components/DebugWarningWidget'; import ExtensionPage from './components/ExtensionPage'; import ExtensionLinkButton from './components/ExtensionLinkButton'; import PermissionGrid from './components/PermissionGrid'; @@ -28,6 +29,7 @@ import UserListPage from './components/UserListPage'; import EditCustomHeaderModal from './components/EditCustomHeaderModal'; import PermissionsPage from './components/PermissionsPage'; import PermissionDropdown from './components/PermissionDropdown'; +import ReadmeModal from './components/ReadmeModal'; import AdminNav from './components/AdminNav'; import AdminHeader from './components/AdminHeader'; import EditCustomCssModal from './components/EditCustomCssModal'; @@ -36,6 +38,8 @@ import routes from './routes'; import AdminApplication from './AdminApplication'; import generateElementId from './utils/generateElementId'; import CreateUserModal from './components/CreateUserModal'; +import ExtensionReadme from './models/ExtensionReadme'; +import ExtensionPageResolver from './resolvers/ExtensionPageResolver'; export default Object.assign(compat, { 'utils/saveSettings': saveSettings, @@ -54,6 +58,7 @@ export default Object.assign(compat, { 'components/HeaderSecondary': HeaderSecondary, 'components/SettingsModal': SettingsModal, 'components/DashboardWidget': DashboardWidget, + 'components/DebugWarningWidget': DebugWarningWidget, 'components/ExtensionPage': ExtensionPage, 'components/ExtensionLinkButton': ExtensionLinkButton, 'components/PermissionGrid': PermissionGrid, @@ -67,11 +72,14 @@ export default Object.assign(compat, { 'components/EditCustomHeaderModal': EditCustomHeaderModal, 'components/PermissionsPage': PermissionsPage, 'components/PermissionDropdown': PermissionDropdown, + 'components/ReadmeModal': ReadmeModal, 'components/AdminNav': AdminNav, 'components/AdminHeader': AdminHeader, 'components/EditCustomCssModal': EditCustomCssModal, 'components/EditGroupModal': EditGroupModal, 'components/CreateUserModal': CreateUserModal, + 'models/ExtensionReadme': ExtensionReadme, + 'resolvers/ExtensionPageResolver': ExtensionPageResolver, routes: routes, AdminApplication: AdminApplication, }); diff --git a/framework/core/js/src/common/compat.ts b/framework/core/js/src/common/compat.ts index 3ebb6a65f8..73c1093b68 100644 --- a/framework/core/js/src/common/compat.ts +++ b/framework/core/js/src/common/compat.ts @@ -3,6 +3,7 @@ import extenders from './extenders'; import Session from './Session'; import Store from './Store'; import BasicEditorDriver from './utils/BasicEditorDriver'; +import bidi from './utils/bidi'; import evented from './utils/evented'; import EventEmitter from './utils/EventEmitter'; import KeyboardNavigatable from './utils/KeyboardNavigatable'; @@ -14,6 +15,7 @@ import computed from './utils/computed'; import insertText from './utils/insertText'; import styleSelectedText from './utils/styleSelectedText'; import Drawer from './utils/Drawer'; +import * as EditorDriverInterface from './utils/EditorDriverInterface'; import anchorScroll from './utils/anchorScroll'; import RequestError from './utils/RequestError'; import abbreviateNumber from './utils/abbreviateNumber'; @@ -36,6 +38,7 @@ import mapRoutes from './utils/mapRoutes'; import withAttr from './utils/withAttr'; import * as FocusTrap from './utils/focusTrap'; import isDark from './utils/isDark'; +import AccessToken from './models/AccessToken'; import Notification from './models/Notification'; import User from './models/User'; import Post from './models/Post'; @@ -62,6 +65,7 @@ import Link from './components/Link'; import LinkButton from './components/LinkButton'; import Checkbox from './components/Checkbox'; import ColorPreviewInput from './components/ColorPreviewInput'; +import ConfirmDocumentUnload from './components/ConfirmDocumentUnload'; import SelectDropdown from './components/SelectDropdown'; import ModalManager from './components/ModalManager'; import Button from './components/Button'; @@ -75,6 +79,8 @@ import Model from './Model'; import Application from './Application'; import fullTime from './helpers/fullTime'; import avatar from './helpers/avatar'; +import fireApplicationError from './helpers/fireApplicationError'; +import * as fireDebugWarning from './helpers/fireDebugWarning'; import icon from './helpers/icon'; import humanTimeHelper from './helpers/humanTime'; import punctuateSeries from './helpers/punctuateSeries'; @@ -98,6 +104,7 @@ export default { Session: Session, Store: Store, 'utils/BasicEditorDriver': BasicEditorDriver, + 'utils/bidi': bidi, 'utils/evented': evented, 'utils/EventEmitter': EventEmitter, 'utils/KeyboardNavigatable': KeyboardNavigatable, @@ -109,6 +116,7 @@ export default { 'utils/insertText': insertText, 'utils/styleSelectedText': styleSelectedText, 'utils/Drawer': Drawer, + 'utils/EditorDriverInterface': EditorDriverInterface, 'utils/anchorScroll': anchorScroll, 'utils/RequestError': RequestError, 'utils/abbreviateNumber': abbreviateNumber, @@ -132,6 +140,7 @@ export default { 'utils/isObject': isObject, 'utils/focusTrap': FocusTrap, 'utils/isDark': isDark, + 'models/AccessToken': AccessToken, 'models/Notification': Notification, 'models/User': User, 'models/Post': Post, @@ -159,6 +168,7 @@ export default { 'components/LinkButton': LinkButton, 'components/Checkbox': Checkbox, 'components/ColorPreviewInput': ColorPreviewInput, + 'components/ConfirmDocumentUnload': ConfirmDocumentUnload, 'components/SelectDropdown': SelectDropdown, 'components/ModalManager': ModalManager, 'components/Button': Button, @@ -173,6 +183,8 @@ export default { Application: Application, 'helpers/fullTime': fullTime, 'helpers/avatar': avatar, + 'helpers/fireApplicationError': fireApplicationError, + 'helpers/fireDebugWarning': fireDebugWarning, 'helpers/icon': icon, 'helpers/humanTime': humanTimeHelper, 'helpers/punctuateSeries': punctuateSeries, diff --git a/framework/core/js/src/forum/compat.ts b/framework/core/js/src/forum/compat.ts index b9358ecfc4..6ccd73911e 100644 --- a/framework/core/js/src/forum/compat.ts +++ b/framework/core/js/src/forum/compat.ts @@ -19,6 +19,7 @@ import AffixedSidebar from './components/AffixedSidebar'; import DiscussionPage from './components/DiscussionPage'; import DiscussionListPane from './components/DiscussionListPane'; import LogInModal from './components/LogInModal'; +import NewAccessTokenModal from './components/NewAccessTokenModal'; import ComposerBody from './components/ComposerBody'; import ForgotPasswordModal from './components/ForgotPasswordModal'; import Notification from './components/Notification'; @@ -100,6 +101,7 @@ export default Object.assign(compat, { 'components/DiscussionPage': DiscussionPage, 'components/DiscussionListPane': DiscussionListPane, 'components/LogInModal': LogInModal, + 'components/NewAccessTokenModal': NewAccessTokenModal, 'components/ComposerBody': ComposerBody, 'components/ForgotPasswordModal': ForgotPasswordModal, 'components/Notification': Notification, From caa557eeb243370179a4296ddcc90a67f85026fa Mon Sep 17 00:00:00 2001 From: Davide Iadeluca Date: Wed, 2 Oct 2024 08:52:57 +0200 Subject: [PATCH 15/15] chore: fix tsconfig --- extensions/akismet/js/tsconfig.json | 1 + extensions/package-manager/js/tsconfig.json | 3 ++- extensions/statistics/js/tsconfig.json | 3 ++- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/extensions/akismet/js/tsconfig.json b/extensions/akismet/js/tsconfig.json index 4d40354629..10534e8a3e 100644 --- a/extensions/akismet/js/tsconfig.json +++ b/extensions/akismet/js/tsconfig.json @@ -15,6 +15,7 @@ "declarationDir": "./dist-typings", "paths": { "flarum/*": ["../../../framework/core/js/dist-typings/*"], + "@flarum/core/*": ["../../../framework/core/js/dist-typings/*"], "flarum/flags/*": ["../../flags/js/dist-typings/*"] } } diff --git a/extensions/package-manager/js/tsconfig.json b/extensions/package-manager/js/tsconfig.json index 747f61f266..5c0840400e 100755 --- a/extensions/package-manager/js/tsconfig.json +++ b/extensions/package-manager/js/tsconfig.json @@ -10,7 +10,8 @@ // This will output typings to `dist-typings` "declarationDir": "./dist-typings", "paths": { - "flarum/*": ["../../../framework/core/js/dist-typings/*"] + "flarum/*": ["../../../framework/core/js/dist-typings/*"], + "@flarum/core/*": ["../../../framework/core/js/dist-typings/*"], } } } diff --git a/extensions/statistics/js/tsconfig.json b/extensions/statistics/js/tsconfig.json index 519ed73b2d..ccab3a2ec6 100644 --- a/extensions/statistics/js/tsconfig.json +++ b/extensions/statistics/js/tsconfig.json @@ -9,7 +9,8 @@ // This will output typings to `dist-typings` "declarationDir": "./dist-typings", "paths": { - "flarum/*": ["../../../framework/core/js/dist-typings/*"] + "flarum/*": ["../../../framework/core/js/dist-typings/*"], + "@flarum/core/*": ["../../../framework/core/js/dist-typings/*"], } } }