From c942f3100dd7381f36764d41b2f6ca4c7b03a887 Mon Sep 17 00:00:00 2001 From: IanM <16573496+imorland@users.noreply.github.com> Date: Sat, 28 Sep 2024 09:11:37 +0100 Subject: [PATCH] Revert "Export all missing modules in compat (#4006)" (#4032) This reverts commit e0adf90453cca66fdafcddcbbcfcaf9d5bdea17f. --- extensions/emoji/js/src/forum/compat.ts | 7 --- extensions/emoji/js/src/forum/index.js | 6 --- extensions/flags/js/src/forum/compat.js | 2 - extensions/likes/js/src/forum/compat.ts | 11 ---- extensions/likes/js/src/forum/index.js | 6 --- extensions/lock/js/src/forum/compat.ts | 7 --- extensions/lock/js/src/forum/index.js | 6 --- 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 --- extensions/mentions/js/src/forum/compat.js | 22 -------- extensions/nicknames/js/src/forum/compat.ts | 5 -- extensions/nicknames/js/src/forum/index.js | 6 --- .../package-manager/js/src/admin/compat.ts | 52 ------------------- .../package-manager/js/src/admin/index.tsx | 6 --- extensions/statistics/js/src/admin/compat.ts | 11 ---- extensions/statistics/js/src/admin/index.tsx | 6 --- extensions/sticky/js/src/forum/compat.ts | 5 -- extensions/sticky/js/src/forum/index.js | 6 --- .../subscriptions/js/src/forum/compat.ts | 9 ---- .../subscriptions/js/src/forum/index.js | 6 --- extensions/suspend/js/src/forum/compat.js | 2 - extensions/tags/js/src/admin/compat.js | 2 - extensions/tags/js/src/forum/compat.js | 2 - framework/core/js/src/admin/compat.ts | 8 --- framework/core/js/src/common/compat.ts | 12 ----- framework/core/js/src/forum/compat.ts | 2 - 29 files changed, 236 deletions(-) delete mode 100644 extensions/emoji/js/src/forum/compat.ts delete mode 100644 extensions/likes/js/src/forum/compat.ts delete mode 100644 extensions/lock/js/src/forum/compat.ts delete mode 100644 extensions/markdown/js/src/admin/compat.ts delete mode 100644 extensions/markdown/js/src/common/compat.ts delete mode 100644 extensions/markdown/js/src/forum/compat.ts delete mode 100644 extensions/nicknames/js/src/forum/compat.ts delete mode 100644 extensions/package-manager/js/src/admin/compat.ts delete mode 100644 extensions/statistics/js/src/admin/compat.ts delete mode 100644 extensions/sticky/js/src/forum/compat.ts delete mode 100644 extensions/subscriptions/js/src/forum/compat.ts diff --git a/extensions/emoji/js/src/forum/compat.ts b/extensions/emoji/js/src/forum/compat.ts deleted file mode 100644 index c797bb17b9..0000000000 --- a/extensions/emoji/js/src/forum/compat.ts +++ /dev/null @@ -1,7 +0,0 @@ -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 6c7d6fe7e7..c8478c44c7 100644 --- a/extensions/emoji/js/src/forum/index.js +++ b/extensions/emoji/js/src/forum/index.js @@ -11,9 +11,3 @@ 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); diff --git a/extensions/flags/js/src/forum/compat.js b/extensions/flags/js/src/forum/compat.js index 1be1efcdd3..5365edd445 100644 --- a/extensions/flags/js/src/forum/compat.js +++ b/extensions/flags/js/src/forum/compat.js @@ -6,7 +6,6 @@ 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, @@ -17,5 +16,4 @@ export default { 'flags/components/FlagPostModal': FlagPostModal, 'flags/components/FlagsPage': FlagsPage, 'flags/components/FlagsDropdown': FlagsDropdown, - 'flags/states/FlagListState': FlagListState, }; diff --git a/extensions/likes/js/src/forum/compat.ts b/extensions/likes/js/src/forum/compat.ts deleted file mode 100644 index 3e19869258..0000000000 --- a/extensions/likes/js/src/forum/compat.ts +++ /dev/null @@ -1,11 +0,0 @@ -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 2fb14404f6..29d7a1d653 100644 --- a/extensions/likes/js/src/forum/index.js +++ b/extensions/likes/js/src/forum/index.js @@ -24,9 +24,3 @@ app.initializers.add('flarum-likes', () => { }); }); }); - -// Expose compat API -import likesCompat from './compat'; -import { compat } from '@flarum/core/forum'; - -Object.assign(compat, likesCompat); diff --git a/extensions/lock/js/src/forum/compat.ts b/extensions/lock/js/src/forum/compat.ts deleted file mode 100644 index 240aa91d20..0000000000 --- a/extensions/lock/js/src/forum/compat.ts +++ /dev/null @@ -1,7 +0,0 @@ -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 1d9a557ef9..0ac405d3cf 100644 --- a/extensions/lock/js/src/forum/index.js +++ b/extensions/lock/js/src/forum/index.js @@ -22,9 +22,3 @@ app.initializers.add('flarum-lock', () => { }); }); }); - -// Expose compat API -import lockCompat from './compat'; -import { compat } from '@flarum/core/forum'; - -Object.assign(compat, lockCompat); diff --git a/extensions/markdown/js/src/admin/compat.ts b/extensions/markdown/js/src/admin/compat.ts deleted file mode 100644 index 426818c2be..0000000000 --- a/extensions/markdown/js/src/admin/compat.ts +++ /dev/null @@ -1,5 +0,0 @@ -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 c315325fa0..e655c3e4cf 100644 --- a/extensions/markdown/js/src/admin/index.js +++ b/extensions/markdown/js/src/admin/index.js @@ -2,9 +2,3 @@ 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 deleted file mode 100644 index cc005d2903..0000000000 --- a/extensions/markdown/js/src/common/compat.ts +++ /dev/null @@ -1,7 +0,0 @@ -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 deleted file mode 100644 index 426818c2be..0000000000 --- a/extensions/markdown/js/src/forum/compat.ts +++ /dev/null @@ -1,5 +0,0 @@ -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 d2d652f39f..b38d9916e3 100644 --- a/extensions/markdown/js/src/forum/index.js +++ b/extensions/markdown/js/src/forum/index.js @@ -2,9 +2,3 @@ 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); diff --git a/extensions/mentions/js/src/forum/compat.js b/extensions/mentions/js/src/forum/compat.js index fdb2ba95b9..8c456f1894 100644 --- a/extensions/mentions/js/src/forum/compat.js +++ b/extensions/mentions/js/src/forum/compat.js @@ -1,6 +1,4 @@ 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'; @@ -11,24 +9,13 @@ 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, @@ -38,16 +25,7 @@ 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, }; diff --git a/extensions/nicknames/js/src/forum/compat.ts b/extensions/nicknames/js/src/forum/compat.ts deleted file mode 100644 index 3029d0f1a4..0000000000 --- a/extensions/nicknames/js/src/forum/compat.ts +++ /dev/null @@ -1,5 +0,0 @@ -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 4d35fe7d60..8c353494cc 100644 --- a/extensions/nicknames/js/src/forum/index.js +++ b/extensions/nicknames/js/src/forum/index.js @@ -110,9 +110,3 @@ app.initializers.add('flarum/nicknames', () => { } }); }); - -// Expose compat API -import nicknamesCompat from './compat'; -import { compat } from '@flarum/core/forum'; - -Object.assign(compat, nicknamesCompat); diff --git a/extensions/package-manager/js/src/admin/compat.ts b/extensions/package-manager/js/src/admin/compat.ts deleted file mode 100644 index c4ae103985..0000000000 --- a/extensions/package-manager/js/src/admin/compat.ts +++ /dev/null @@ -1,52 +0,0 @@ -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 12bd79ce96..0219c91cef 100755 --- a/extensions/package-manager/js/src/admin/index.tsx +++ b/extensions/package-manager/js/src/admin/index.tsx @@ -82,9 +82,3 @@ app.initializers.add('flarum-extension-manager', (app) => { ); }); }); - -// Expose compat API -import packageManagerCompat from './compat'; -import { compat } from '@flarum/core/admin'; - -Object.assign(compat, packageManagerCompat); diff --git a/extensions/statistics/js/src/admin/compat.ts b/extensions/statistics/js/src/admin/compat.ts deleted file mode 100644 index 7edce73909..0000000000 --- a/extensions/statistics/js/src/admin/compat.ts +++ /dev/null @@ -1,11 +0,0 @@ -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 6dc4f42e75..e2886c1e54 100644 --- a/extensions/statistics/js/src/admin/index.tsx +++ b/extensions/statistics/js/src/admin/index.tsx @@ -13,9 +13,3 @@ 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); diff --git a/extensions/sticky/js/src/forum/compat.ts b/extensions/sticky/js/src/forum/compat.ts deleted file mode 100644 index 4b3566fda4..0000000000 --- a/extensions/sticky/js/src/forum/compat.ts +++ /dev/null @@ -1,5 +0,0 @@ -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 e930c6cee6..be902a403b 100644 --- a/extensions/sticky/js/src/forum/index.js +++ b/extensions/sticky/js/src/forum/index.js @@ -13,9 +13,3 @@ app.initializers.add('flarum-sticky', () => { addStickyExcerpt(); addStickyClass(); }); - -// Expose compat API -import stickyCompat from './compat'; -import { compat } from '@flarum/core/forum'; - -Object.assign(compat, stickyCompat); diff --git a/extensions/subscriptions/js/src/forum/compat.ts b/extensions/subscriptions/js/src/forum/compat.ts deleted file mode 100644 index 7f9d37100e..0000000000 --- a/extensions/subscriptions/js/src/forum/compat.ts +++ /dev/null @@ -1,9 +0,0 @@ -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 485f07d59f..181fa4dc96 100644 --- a/extensions/subscriptions/js/src/forum/index.js +++ b/extensions/subscriptions/js/src/forum/index.js @@ -29,9 +29,3 @@ app.initializers.add('subscriptions', function () { }); }); }); - -// Expose compat API -import subscriptionsCompat from './compat'; -import { compat } from '@flarum/core/forum'; - -Object.assign(compat, subscriptionsCompat); diff --git a/extensions/suspend/js/src/forum/compat.js b/extensions/suspend/js/src/forum/compat.js index a0fb9a7051..f1931b7c38 100644 --- a/extensions/suspend/js/src/forum/compat.js +++ b/extensions/suspend/js/src/forum/compat.js @@ -2,7 +2,6 @@ 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 { @@ -10,6 +9,5 @@ export default { 'suspend/components/suspensionInfoModal': SuspensionInfoModal, 'suspend/components/UserSuspendedNotification': UserSuspendedNotification, 'suspend/components/UserUnsuspendedNotification': UserUnsuspendedNotification, - 'suspend/helpers/suspensionHelper': suspensionHelper, 'suspend/checkForSuspension': checkForSuspension, }; diff --git a/extensions/tags/js/src/admin/compat.js b/extensions/tags/js/src/admin/compat.js index 89ed2d8b00..025584d94d 100644 --- a/extensions/tags/js/src/admin/compat.js +++ b/extensions/tags/js/src/admin/compat.js @@ -4,7 +4,6 @@ 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'; @@ -13,7 +12,6 @@ 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 bee94ca4f1..7059c27e08 100644 --- a/extensions/tags/js/src/forum/compat.js +++ b/extensions/tags/js/src/forum/compat.js @@ -5,7 +5,6 @@ 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'; @@ -19,7 +18,6 @@ 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, diff --git a/framework/core/js/src/admin/compat.ts b/framework/core/js/src/admin/compat.ts index 4b6bd6e635..0121321425 100644 --- a/framework/core/js/src/admin/compat.ts +++ b/framework/core/js/src/admin/compat.ts @@ -15,7 +15,6 @@ 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'; @@ -29,7 +28,6 @@ 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'; @@ -38,8 +36,6 @@ 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, @@ -58,7 +54,6 @@ 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, @@ -72,14 +67,11 @@ 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 73c1093b68..3ebb6a65f8 100644 --- a/framework/core/js/src/common/compat.ts +++ b/framework/core/js/src/common/compat.ts @@ -3,7 +3,6 @@ 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'; @@ -15,7 +14,6 @@ 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'; @@ -38,7 +36,6 @@ 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'; @@ -65,7 +62,6 @@ 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'; @@ -79,8 +75,6 @@ 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'; @@ -104,7 +98,6 @@ export default { Session: Session, Store: Store, 'utils/BasicEditorDriver': BasicEditorDriver, - 'utils/bidi': bidi, 'utils/evented': evented, 'utils/EventEmitter': EventEmitter, 'utils/KeyboardNavigatable': KeyboardNavigatable, @@ -116,7 +109,6 @@ export default { 'utils/insertText': insertText, 'utils/styleSelectedText': styleSelectedText, 'utils/Drawer': Drawer, - 'utils/EditorDriverInterface': EditorDriverInterface, 'utils/anchorScroll': anchorScroll, 'utils/RequestError': RequestError, 'utils/abbreviateNumber': abbreviateNumber, @@ -140,7 +132,6 @@ export default { 'utils/isObject': isObject, 'utils/focusTrap': FocusTrap, 'utils/isDark': isDark, - 'models/AccessToken': AccessToken, 'models/Notification': Notification, 'models/User': User, 'models/Post': Post, @@ -168,7 +159,6 @@ export default { 'components/LinkButton': LinkButton, 'components/Checkbox': Checkbox, 'components/ColorPreviewInput': ColorPreviewInput, - 'components/ConfirmDocumentUnload': ConfirmDocumentUnload, 'components/SelectDropdown': SelectDropdown, 'components/ModalManager': ModalManager, 'components/Button': Button, @@ -183,8 +173,6 @@ 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 8b9dde1fa0..f4fbceeec8 100644 --- a/framework/core/js/src/forum/compat.ts +++ b/framework/core/js/src/forum/compat.ts @@ -19,7 +19,6 @@ 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'; @@ -102,7 +101,6 @@ 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,