From a4b678ce5195271a70f3633e8feeabaa03a0e1b4 Mon Sep 17 00:00:00 2001 From: Ian Morland Date: Fri, 7 Jan 2022 17:31:06 +0000 Subject: [PATCH] Update JS imports --- .../js/src/forum/addSubscriptionBadge.js | 7 ++++--- .../js/src/forum/addSubscriptionControls.js | 9 +++++---- .../js/src/forum/addSubscriptionFilter.js | 11 ++++++----- .../js/src/forum/addSubscriptionSettings.js | 7 ++++--- .../js/src/forum/components/NewPostNotification.js | 4 ++-- .../js/src/forum/components/SubscriptionMenu.js | 11 ++++++----- .../js/src/forum/components/SubscriptionMenuItem.js | 4 ++-- extensions/subscriptions/js/src/forum/index.js | 12 ++++++------ 8 files changed, 35 insertions(+), 30 deletions(-) diff --git a/extensions/subscriptions/js/src/forum/addSubscriptionBadge.js b/extensions/subscriptions/js/src/forum/addSubscriptionBadge.js index 625f4eaff..317131a24 100644 --- a/extensions/subscriptions/js/src/forum/addSubscriptionBadge.js +++ b/extensions/subscriptions/js/src/forum/addSubscriptionBadge.js @@ -1,6 +1,7 @@ -import { extend } from 'flarum/extend'; -import Discussion from 'flarum/models/Discussion'; -import Badge from 'flarum/components/Badge'; +import app from 'flarum/forum/app'; +import { extend } from 'flarum/common/extend'; +import Discussion from 'flarum/common/models/Discussion'; +import Badge from 'flarum/common/components/Badge'; export default function addSubscriptionBadge() { extend(Discussion.prototype, 'badges', function(badges) { diff --git a/extensions/subscriptions/js/src/forum/addSubscriptionControls.js b/extensions/subscriptions/js/src/forum/addSubscriptionControls.js index 01fed4101..0620eb462 100644 --- a/extensions/subscriptions/js/src/forum/addSubscriptionControls.js +++ b/extensions/subscriptions/js/src/forum/addSubscriptionControls.js @@ -1,7 +1,8 @@ -import { extend } from 'flarum/extend'; -import Button from 'flarum/components/Button'; -import DiscussionPage from 'flarum/components/DiscussionPage'; -import DiscussionControls from 'flarum/utils/DiscussionControls'; +import app from 'flarum/forum/app'; +import { extend } from 'flarum/common/extend'; +import Button from 'flarum/common/components/Button'; +import DiscussionPage from 'flarum/forum/components/DiscussionPage'; +import DiscussionControls from 'flarum/forum/utils/DiscussionControls'; import SubscriptionMenu from './components/SubscriptionMenu'; diff --git a/extensions/subscriptions/js/src/forum/addSubscriptionFilter.js b/extensions/subscriptions/js/src/forum/addSubscriptionFilter.js index b7076e4e5..38342b4ed 100644 --- a/extensions/subscriptions/js/src/forum/addSubscriptionFilter.js +++ b/extensions/subscriptions/js/src/forum/addSubscriptionFilter.js @@ -1,8 +1,9 @@ -import { extend } from 'flarum/extend'; -import LinkButton from 'flarum/components/LinkButton'; -import IndexPage from 'flarum/components/IndexPage'; -import DiscussionListState from 'flarum/states/DiscussionListState'; -import GlobalSearchState from 'flarum/states/GlobalSearchState'; +import app from 'flarum/forum/app'; +import { extend } from 'flarum/common/extend'; +import LinkButton from 'flarum/common/components/LinkButton'; +import IndexPage from 'flarum/forum/components/IndexPage'; +import DiscussionListState from 'flarum/forum/states/DiscussionListState'; +import GlobalSearchState from 'flarum/forum/states/GlobalSearchState'; export default function addSubscriptionFilter() { extend(IndexPage.prototype, 'navItems', function(items) { diff --git a/extensions/subscriptions/js/src/forum/addSubscriptionSettings.js b/extensions/subscriptions/js/src/forum/addSubscriptionSettings.js index de60acc5e..afedd13cb 100644 --- a/extensions/subscriptions/js/src/forum/addSubscriptionSettings.js +++ b/extensions/subscriptions/js/src/forum/addSubscriptionSettings.js @@ -1,6 +1,7 @@ -import { extend } from 'flarum/extend'; -import SettingsPage from 'flarum/components/SettingsPage'; -import Switch from 'flarum/components/Switch'; +import app from 'flarum/forum/app'; +import { extend } from 'flarum/common/extend'; +import SettingsPage from 'flarum/forum/components/SettingsPage'; +import Switch from 'flarum/common/components/Switch'; export default function () { extend(SettingsPage.prototype, 'notificationsItems', function (items) { diff --git a/extensions/subscriptions/js/src/forum/components/NewPostNotification.js b/extensions/subscriptions/js/src/forum/components/NewPostNotification.js index 43f33b208..d4e69991c 100644 --- a/extensions/subscriptions/js/src/forum/components/NewPostNotification.js +++ b/extensions/subscriptions/js/src/forum/components/NewPostNotification.js @@ -1,5 +1,5 @@ -import Notification from 'flarum/components/Notification'; -import username from 'flarum/helpers/username'; +import app from 'flarum/forum/app'; +import Notification from 'flarum/forum/components/Notification'; export default class NewPostNotification extends Notification { icon() { diff --git a/extensions/subscriptions/js/src/forum/components/SubscriptionMenu.js b/extensions/subscriptions/js/src/forum/components/SubscriptionMenu.js index f33535e59..ba5794691 100644 --- a/extensions/subscriptions/js/src/forum/components/SubscriptionMenu.js +++ b/extensions/subscriptions/js/src/forum/components/SubscriptionMenu.js @@ -1,9 +1,10 @@ -import Dropdown from 'flarum/components/Dropdown'; -import Button from 'flarum/components/Button'; +import app from 'flarum/forum/app'; +import Dropdown from 'flarum/common/components/Dropdown'; +import Button from 'flarum/common/components/Button'; import Tooltip from 'flarum/common/components/Tooltip'; -import icon from 'flarum/helpers/icon'; -import extractText from 'flarum/utils/extractText'; -import classList from 'flarum/utils/classList'; +import icon from 'flarum/common/helpers/icon'; +import extractText from 'flarum/common/utils/extractText'; +import classList from 'flarum/common/utils/classList'; import SubscriptionMenuItem from './SubscriptionMenuItem'; diff --git a/extensions/subscriptions/js/src/forum/components/SubscriptionMenuItem.js b/extensions/subscriptions/js/src/forum/components/SubscriptionMenuItem.js index d0c500ca9..5fa8db3af 100644 --- a/extensions/subscriptions/js/src/forum/components/SubscriptionMenuItem.js +++ b/extensions/subscriptions/js/src/forum/components/SubscriptionMenuItem.js @@ -1,5 +1,5 @@ -import Component from 'flarum/Component'; -import icon from 'flarum/helpers/icon'; +import Component from 'flarum/common/Component'; +import icon from 'flarum/common/helpers/icon'; export default class SubscriptionMenuItem extends Component { view() { diff --git a/extensions/subscriptions/js/src/forum/index.js b/extensions/subscriptions/js/src/forum/index.js index 95db010f6..e5b35be85 100644 --- a/extensions/subscriptions/js/src/forum/index.js +++ b/extensions/subscriptions/js/src/forum/index.js @@ -1,9 +1,9 @@ -import { extend } from 'flarum/extend'; -import app from 'flarum/app'; -import Model from 'flarum/Model'; -import Discussion from 'flarum/models/Discussion'; -import IndexPage from 'flarum/components/IndexPage'; -import NotificationGrid from 'flarum/components/NotificationGrid'; +import { extend } from 'flarum/common/extend'; +import app from 'flarum/forum/app'; +import Model from 'flarum/common/Model'; +import Discussion from 'flarum/common/models/Discussion'; +import IndexPage from 'flarum/forum/components/IndexPage'; +import NotificationGrid from 'flarum/forum/components/NotificationGrid'; import addSubscriptionBadge from './addSubscriptionBadge'; import addSubscriptionControls from './addSubscriptionControls';