From 9d7f9eb0e5a4762dff632054ed5c6fa7eda4f22f Mon Sep 17 00:00:00 2001 From: Ian Morland <16573496+imorland@users.noreply.github.com> Date: Fri, 7 Jan 2022 17:07:20 +0000 Subject: [PATCH] Update JS imports (#40) --- .../flags/js/src/admin/{index.js => index.ts} | 2 +- extensions/flags/js/src/forum/addFlagControl.js | 8 ++++---- extensions/flags/js/src/forum/addFlagsDropdown.js | 6 +++--- extensions/flags/js/src/forum/addFlagsToPosts.js | 14 +++++++------- .../flags/js/src/forum/components/FlagList.js | 15 ++++++++------- .../js/src/forum/components/FlagsDropdown.js | 1 + .../flags/js/src/forum/components/FlagsPage.js | 1 + extensions/flags/js/src/forum/index.js | 4 ++-- extensions/flags/js/src/forum/models/Flag.js | 2 +- 9 files changed, 28 insertions(+), 25 deletions(-) rename extensions/flags/js/src/admin/{index.js => index.ts} (96%) diff --git a/extensions/flags/js/src/admin/index.js b/extensions/flags/js/src/admin/index.ts similarity index 96% rename from extensions/flags/js/src/admin/index.js rename to extensions/flags/js/src/admin/index.ts index 7159f6d71..7b54de998 100644 --- a/extensions/flags/js/src/admin/index.js +++ b/extensions/flags/js/src/admin/index.ts @@ -1,4 +1,4 @@ -import app from 'flarum/app'; +import app from 'flarum/admin/app'; app.initializers.add('flarum-flags', () => { app.extensionData diff --git a/extensions/flags/js/src/forum/addFlagControl.js b/extensions/flags/js/src/forum/addFlagControl.js index 88faefe2a..9c6246c45 100644 --- a/extensions/flags/js/src/forum/addFlagControl.js +++ b/extensions/flags/js/src/forum/addFlagControl.js @@ -1,7 +1,7 @@ -import { extend } from 'flarum/extend'; -import app from 'flarum/app'; -import PostControls from 'flarum/utils/PostControls'; -import Button from 'flarum/components/Button'; +import { extend } from 'flarum/common/extend'; +import app from 'flarum/forum/app'; +import PostControls from 'flarum/forum/utils/PostControls'; +import Button from 'flarum/common/components/Button'; import FlagPostModal from './components/FlagPostModal'; diff --git a/extensions/flags/js/src/forum/addFlagsDropdown.js b/extensions/flags/js/src/forum/addFlagsDropdown.js index 07e929e90..dc0f1a798 100644 --- a/extensions/flags/js/src/forum/addFlagsDropdown.js +++ b/extensions/flags/js/src/forum/addFlagsDropdown.js @@ -1,6 +1,6 @@ -import { extend } from 'flarum/extend'; -import app from 'flarum/app'; -import HeaderSecondary from 'flarum/components/HeaderSecondary'; +import { extend } from 'flarum/common/extend'; +import app from 'flarum/forum/app'; +import HeaderSecondary from 'flarum/forum/components/HeaderSecondary'; import FlagsDropdown from './components/FlagsDropdown'; export default function () { diff --git a/extensions/flags/js/src/forum/addFlagsToPosts.js b/extensions/flags/js/src/forum/addFlagsToPosts.js index 95b0f68d4..f053a21f5 100644 --- a/extensions/flags/js/src/forum/addFlagsToPosts.js +++ b/extensions/flags/js/src/forum/addFlagsToPosts.js @@ -1,10 +1,10 @@ -import { extend } from 'flarum/extend'; -import app from 'flarum/app'; -import Post from 'flarum/components/Post'; -import Button from 'flarum/components/Button'; -import ItemList from 'flarum/utils/ItemList'; -import PostControls from 'flarum/utils/PostControls'; -import humanTime from 'flarum/utils/humanTime'; +import { extend } from 'flarum/common/extend'; +import app from 'flarum/forum/app'; +import Post from 'flarum/forum/components/Post'; +import Button from 'flarum/common/components/Button'; +import ItemList from 'flarum/common/utils/ItemList'; +import PostControls from 'flarum/forum/utils/PostControls'; +import humanTime from 'flarum/common/utils/humanTime'; export default function () { extend(Post.prototype, 'elementAttrs', function (attrs) { diff --git a/extensions/flags/js/src/forum/components/FlagList.js b/extensions/flags/js/src/forum/components/FlagList.js index 8632f8781..115df12ad 100644 --- a/extensions/flags/js/src/forum/components/FlagList.js +++ b/extensions/flags/js/src/forum/components/FlagList.js @@ -1,10 +1,11 @@ -import Component from 'flarum/Component'; -import Link from 'flarum/components/Link'; -import LoadingIndicator from 'flarum/components/LoadingIndicator'; -import avatar from 'flarum/helpers/avatar'; -import username from 'flarum/helpers/username'; -import icon from 'flarum/helpers/icon'; -import humanTime from 'flarum/helpers/humanTime'; +import app from 'flarum/forum/app'; +import Component from 'flarum/common/Component'; +import Link from 'flarum/common/components/Link'; +import LoadingIndicator from 'flarum/common/components/LoadingIndicator'; +import avatar from 'flarum/common/helpers/avatar'; +import username from 'flarum/common/helpers/username'; +import icon from 'flarum/common/helpers/icon'; +import humanTime from 'flarum/common/helpers/humanTime'; export default class FlagList extends Component { oninit(vnode) { diff --git a/extensions/flags/js/src/forum/components/FlagsDropdown.js b/extensions/flags/js/src/forum/components/FlagsDropdown.js index 3ff93fad5..72b249a59 100644 --- a/extensions/flags/js/src/forum/components/FlagsDropdown.js +++ b/extensions/flags/js/src/forum/components/FlagsDropdown.js @@ -1,3 +1,4 @@ +import app from 'flarum/forum/app'; import NotificationsDropdown from 'flarum/components/NotificationsDropdown'; import FlagList from './FlagList'; diff --git a/extensions/flags/js/src/forum/components/FlagsPage.js b/extensions/flags/js/src/forum/components/FlagsPage.js index e597b2860..6e07ef555 100644 --- a/extensions/flags/js/src/forum/components/FlagsPage.js +++ b/extensions/flags/js/src/forum/components/FlagsPage.js @@ -1,3 +1,4 @@ +import app from 'flarum/forum/app'; import Page from 'flarum/components/Page'; import FlagList from './FlagList'; diff --git a/extensions/flags/js/src/forum/index.js b/extensions/flags/js/src/forum/index.js index b34b38223..5551715fe 100644 --- a/extensions/flags/js/src/forum/index.js +++ b/extensions/flags/js/src/forum/index.js @@ -1,5 +1,5 @@ -import app from 'flarum/app'; -import Model from 'flarum/Model'; +import app from 'flarum/forum/app'; +import Model from 'flarum/common/Model'; import Flag from './models/Flag'; import FlagsPage from './components/FlagsPage'; diff --git a/extensions/flags/js/src/forum/models/Flag.js b/extensions/flags/js/src/forum/models/Flag.js index 25b7af008..afe946842 100644 --- a/extensions/flags/js/src/forum/models/Flag.js +++ b/extensions/flags/js/src/forum/models/Flag.js @@ -1,4 +1,4 @@ -import Model from 'flarum/Model'; +import Model from 'flarum/common/Model'; class Flag extends Model {}