From b054ae7dcb7e2d5bc1faede3e48342ad71c7abeb Mon Sep 17 00:00:00 2001
From: David Wheatley <hi@davwheat.dev>
Date: Wed, 25 Aug 2021 21:06:28 +0100
Subject: [PATCH] Update JS imports to new namespaced style (#39)

---
 extensions/emoji/js/src/forum/addComposerAutocomplete.js  | 8 ++++----
 .../emoji/js/src/forum/fragments/AutocompleteDropdown.js  | 2 +-
 extensions/emoji/js/src/forum/index.js                    | 2 +-
 extensions/emoji/js/src/forum/renderEmoji.js              | 6 ++----
 4 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/extensions/emoji/js/src/forum/addComposerAutocomplete.js b/extensions/emoji/js/src/forum/addComposerAutocomplete.js
index 538289037..eeec27c60 100644
--- a/extensions/emoji/js/src/forum/addComposerAutocomplete.js
+++ b/extensions/emoji/js/src/forum/addComposerAutocomplete.js
@@ -1,9 +1,9 @@
 import emojiMap from 'simple-emoji-map';
 
-import { extend } from 'flarum/extend';
-import TextEditor from 'flarum/components/TextEditor';
-import TextEditorButton from 'flarum/components/TextEditorButton';
-import KeyboardNavigatable from 'flarum/utils/KeyboardNavigatable';
+import { extend } from 'flarum/common/extend';
+import TextEditor from 'flarum/common/components/TextEditor';
+import TextEditorButton from 'flarum/common/components/TextEditorButton';
+import KeyboardNavigatable from 'flarum/forum/utils/KeyboardNavigatable';
 
 import AutocompleteDropdown from './fragments/AutocompleteDropdown';
 import getEmojiIconCode from './helpers/getEmojiIconCode';
diff --git a/extensions/emoji/js/src/forum/fragments/AutocompleteDropdown.js b/extensions/emoji/js/src/forum/fragments/AutocompleteDropdown.js
index 4c69fc0ed..e4f27921e 100644
--- a/extensions/emoji/js/src/forum/fragments/AutocompleteDropdown.js
+++ b/extensions/emoji/js/src/forum/fragments/AutocompleteDropdown.js
@@ -1,4 +1,4 @@
-import Fragment from 'flarum/Fragment';
+import Fragment from 'flarum/common/Fragment';
 
 export default class AutocompleteDropdown extends Fragment {
   items = [];
diff --git a/extensions/emoji/js/src/forum/index.js b/extensions/emoji/js/src/forum/index.js
index d9fbab04c..c8478c44c 100644
--- a/extensions/emoji/js/src/forum/index.js
+++ b/extensions/emoji/js/src/forum/index.js
@@ -1,4 +1,4 @@
-import app from 'flarum/app';
+import app from 'flarum/forum/app';
 
 import addComposerAutocomplete from './addComposerAutocomplete';
 import renderEmoji from './renderEmoji';
diff --git a/extensions/emoji/js/src/forum/renderEmoji.js b/extensions/emoji/js/src/forum/renderEmoji.js
index b09d1e41e..340f32f4c 100644
--- a/extensions/emoji/js/src/forum/renderEmoji.js
+++ b/extensions/emoji/js/src/forum/renderEmoji.js
@@ -1,9 +1,7 @@
-/*global s9e*/
-
 import twemoji from 'twemoji';
 
-import { override } from 'flarum/extend';
-import Post from 'flarum/models/Post';
+import { override } from 'flarum/common/extend';
+import Post from 'flarum/common/models/Post';
 
 import base from './cdn';