DEV: Tidy up imports. (#11364)

Only allow one import definition per file and add a new eslint rule to enforce it.

.eslintrc

@@ -1,7 +1,8 @@
 {
   "extends": "eslint-config-discourse",
   "rules": {
-    "discourse-ember/global-ember": 2
+    "discourse-ember/global-ember": 2,
+    "no-duplicate-imports": 2
   },
   "globals": {
     "moduleFor": "off",

app/assets/javascripts/admin/addon/components/admin-user-field-item.js

@@ -6,8 +6,7 @@ import Component from "@ember/component";
 import UserField from "admin/models/user-field";
 import { bufferedProperty } from "discourse/mixins/buffered-content";
 import { popupAjaxError } from "discourse/lib/ajax-error";
-import { propertyEqual } from "discourse/lib/computed";
+import { propertyEqual, i18n } from "discourse/lib/computed";
-import { i18n } from "discourse/lib/computed";
 import discourseComputed, {
   observes,
   on,

app/assets/javascripts/admin/addon/components/embeddable-host.js

@@ -1,11 +1,13 @@
 import I18n from "I18n";
-import discourseComputed from "discourse-common/utils/decorators";
+import discourseComputed, {
+  on,
+  observes,
+} from "discourse-common/utils/decorators";
 import { isEmpty } from "@ember/utils";
 import { or } from "@ember/object/computed";
 import { schedule } from "@ember/runloop";
 import Component from "@ember/component";
 import { bufferedProperty } from "discourse/mixins/buffered-content";
-import { on, observes } from "discourse-common/utils/decorators";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 import Category from "discourse/models/category";
 import bootbox from "bootbox";

app/assets/javascripts/admin/addon/components/penalty-post-action.js

@@ -1,8 +1,9 @@
 import I18n from "I18n";
-import discourseComputed from "discourse-common/utils/decorators";
+import discourseComputed, {
+  afterRender,
+} from "discourse-common/utils/decorators";
 import { equal } from "@ember/object/computed";
 import Component from "@ember/component";
-import { afterRender } from "discourse-common/utils/decorators";
 
 const ACTIONS = ["delete", "delete_replies", "edit", "none"];
 

app/assets/javascripts/admin/addon/components/screened-ip-address-form.js

@@ -1,8 +1,9 @@
 import I18n from "I18n";
-import discourseComputed from "discourse-common/utils/decorators";
+import discourseComputed, { on } from "discourse-common/utils/decorators";
 import { schedule } from "@ember/runloop";
 import Component from "@ember/component";
 import bootbox from "bootbox";
+import ScreenedIpAddress from "admin/models/screened-ip-address";
 
 /**
   A form to create an IP address that will be blocked or allowed.
@@ -15,9 +16,6 @@ import bootbox from "bootbox";
   as an argument.
 **/
 
-import ScreenedIpAddress from "admin/models/screened-ip-address";
-import { on } from "discourse-common/utils/decorators";
-
 export default Component.extend({
   classNames: ["screened-ip-address-form"],
   formSubmitted: false,

app/assets/javascripts/admin/addon/components/value-list.js

@@ -1,8 +1,7 @@
-import discourseComputed from "discourse-common/utils/decorators";
+import discourseComputed, { on } from "discourse-common/utils/decorators";
 import { makeArray } from "discourse-common/lib/helpers";
 import { empty, reads } from "@ember/object/computed";
 import Component from "@ember/component";
-import { on } from "discourse-common/utils/decorators";
 
 export default Component.extend({
   classNameBindings: [":value-list"],

app/assets/javascripts/admin/addon/controllers/admin-customize-email-templates-edit.js

@@ -1,10 +1,9 @@
 import I18n from "I18n";
 import discourseComputed from "discourse-common/utils/decorators";
-import Controller from "@ember/controller";
+import Controller, { inject as controller } from "@ember/controller";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 import { bufferedProperty } from "discourse/mixins/buffered-content";
 import { action } from "@ember/object";
-import { inject as controller } from "@ember/controller";
 import bootbox from "bootbox";
 
 export default Controller.extend(bufferedProperty("emailTemplate"), {

app/assets/javascripts/admin/addon/controllers/admin-dashboard-general.js

@@ -1,8 +1,7 @@
 import I18n from "I18n";
 import discourseComputed from "discourse-common/utils/decorators";
 import { makeArray } from "discourse-common/lib/helpers";
-import { inject } from "@ember/controller";
+import Controller, { inject } from "@ember/controller";
-import Controller from "@ember/controller";
 import { setting } from "discourse/lib/computed";
 import AdminDashboard from "admin/models/admin-dashboard";
 import Report from "admin/models/report";

app/assets/javascripts/admin/addon/controllers/admin-user-index.js

@@ -4,11 +4,10 @@ import { inject as service } from "@ember/service";
 import Controller from "@ember/controller";
 import { ajax } from "discourse/lib/ajax";
 import CanCheckEmails from "discourse/mixins/can-check-emails";
-import { propertyNotEqual, setting } from "discourse/lib/computed";
+import { propertyNotEqual, setting, fmt } from "discourse/lib/computed";
 import { userPath } from "discourse/lib/url";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 import discourseComputed from "discourse-common/utils/decorators";
-import { fmt } from "discourse/lib/computed";
 import { htmlSafe } from "@ember/template";
 import showModal from "discourse/lib/show-modal";
 import bootbox from "bootbox";

app/assets/javascripts/admin/addon/models/report.js

@@ -4,13 +4,13 @@ import discourseComputed from "discourse-common/utils/decorators";
 import { makeArray } from "discourse-common/lib/helpers";
 import { isEmpty } from "@ember/utils";
 import EmberObject from "@ember/object";
-import { escapeExpression } from "discourse/lib/utilities";
 import { ajax } from "discourse/lib/ajax";
 import round from "discourse/lib/round";
 import {
   fillMissingDates,
   formatUsername,
   toNumber,
+  escapeExpression,
 } from "discourse/lib/utilities";
 import { number, durationTiny } from "discourse/lib/formatter";
 import { renderAvatar } from "discourse/helpers/user-avatar";

app/assets/javascripts/discourse-common/addon/utils/decorators.js

@@ -3,8 +3,7 @@ import isDescriptor from "discourse-common/utils/is-descriptor";
 import extractValue from "discourse-common/utils/extract-value";
 import decoratorAlias from "discourse-common/utils/decorator-alias";
 import macroAlias from "discourse-common/utils/macro-alias";
-import { schedule, next } from "@ember/runloop";
+import { schedule, next, bind as emberBind } from "@ember/runloop";
-import { bind as emberBind } from "@ember/runloop";
 
 export default function discourseComputedDecorator(...params) {
   // determine if user called as @discourseComputed('blah', 'blah') or @discourseComputed

app/assets/javascripts/discourse/app/adapters/post.js

@@ -1,6 +1,5 @@
 import { ajax } from "discourse/lib/ajax";
-import RestAdapter from "discourse/adapters/rest";
+import RestAdapter, { Result } from "discourse/adapters/rest";
-import { Result } from "discourse/adapters/rest";
 import { underscore } from "@ember/string";
 
 export default RestAdapter.extend({

app/assets/javascripts/discourse/app/components/bookmark-actions-dropdown.js

@@ -1,7 +1,6 @@
 import I18n from "I18n";
-import { computed } from "@ember/object";
+import { computed, action } from "@ember/object";
 import DropdownSelectBoxComponent from "select-kit/components/dropdown-select-box";
-import { action } from "@ember/object";
 
 export default DropdownSelectBoxComponent.extend({
   classNames: ["bookmark-actions-dropdown"],

app/assets/javascripts/discourse/app/components/choose-topic.js

@@ -3,8 +3,7 @@ import { next } from "@ember/runloop";
 import Component from "@ember/component";
 import discourseDebounce from "discourse/lib/debounce";
 import { searchForTerm } from "discourse/lib/search";
-import { observes } from "discourse-common/utils/decorators";
+import discourseComputed, { observes } from "discourse-common/utils/decorators";
-import discourseComputed from "discourse-common/utils/decorators";
 
 export default Component.extend({
   loading: null,

app/assets/javascripts/discourse/app/components/create-topics-notice.js

@@ -1,8 +1,7 @@
 import I18n from "I18n";
-import discourseComputed from "discourse-common/utils/decorators";
+import discourseComputed, { observes } from "discourse-common/utils/decorators";
 import { alias } from "@ember/object/computed";
 import Component from "@ember/component";
-import { observes } from "discourse-common/utils/decorators";
 import LivePostCounts from "discourse/models/live-post-counts";
 import { htmlSafe } from "@ember/template";
 

app/assets/javascripts/discourse/app/components/d-editor.js

@@ -10,7 +10,6 @@ import discourseComputed, {
 } from "discourse-common/utils/decorators";
 import { categoryHashtagTriggerRule } from "discourse/lib/category-hashtags";
 import { search as searchCategoryTag } from "discourse/lib/category-tag-search";
-import { generateCookFunction } from "discourse/lib/text";
 import { getRegister } from "discourse-common/lib/get-owner";
 import { findRawTemplate } from "discourse-common/lib/raw-templates";
 import { siteDir } from "discourse/lib/text-direction";
@@ -26,7 +25,7 @@ import deprecated from "discourse-common/lib/deprecated";
 import { wantsNewWindow } from "discourse/lib/intercept-click";
 import { translations } from "pretty-text/emoji/data";
 import { emojiSearch, isSkinTonableEmoji } from "pretty-text/emoji";
-import { emojiUrlFor } from "discourse/lib/text";
+import { emojiUrlFor, generateCookFunction } from "discourse/lib/text";
 import showModal from "discourse/lib/show-modal";
 import { Promise } from "rsvp";
 import { isTesting } from "discourse-common/config/environment";

app/assets/javascripts/discourse/app/components/edit-category-security.js

@@ -1,7 +1,6 @@
 import { buildCategoryPanel } from "discourse/components/edit-category-panel";
 import PermissionType from "discourse/models/permission-type";
 import discourseComputed from "discourse-common/utils/decorators";
-
 import { not } from "@ember/object/computed";
 
 export default buildCategoryPanel("security", {

app/assets/javascripts/discourse/app/components/emoji-picker.js

@@ -1,20 +1,17 @@
-import { observes } from "discourse-common/utils/decorators";
+import { observes, bind } from "discourse-common/utils/decorators";
-import { bind } from "discourse-common/utils/decorators";
 import { htmlSafe } from "@ember/template";
-import { emojiUnescape } from "discourse/lib/text";
+import { emojiUnescape, emojiUrlFor } from "discourse/lib/text";
-import { escapeExpression } from "discourse/lib/utilities";
 import { action, computed } from "@ember/object";
 import { inject as service } from "@ember/service";
 import { schedule, later } from "@ember/runloop";
 import Component from "@ember/component";
-import { emojiUrlFor } from "discourse/lib/text";
 import { createPopper } from "@popperjs/core";
 import {
   extendedEmojiList,
   isSkinTonableEmoji,
   emojiSearch,
 } from "pretty-text/emoji";
-import { safariHacksDisabled } from "discourse/lib/utilities";
+import { safariHacksDisabled, escapeExpression } from "discourse/lib/utilities";
 
 function customEmojis() {
   const list = extendedEmojiList();

app/assets/javascripts/discourse/app/components/group-flair-inputs.js

@@ -1,9 +1,11 @@
 import getURL from "discourse-common/lib/get-url";
 import I18n from "I18n";
-import discourseComputed from "discourse-common/utils/decorators";
+import discourseComputed, {
+  on,
+  observes,
+} from "discourse-common/utils/decorators";
 import { debounce } from "@ember/runloop";
 import Component from "@ember/component";
-import { on, observes } from "discourse-common/utils/decorators";
 import { escapeExpression } from "discourse/lib/utilities";
 import { convertIconClass } from "discourse-common/lib/icon-library";
 import { ajax } from "discourse/lib/ajax";

app/assets/javascripts/discourse/app/components/search-text-field.js

@@ -1,6 +1,5 @@
 import I18n from "I18n";
-import discourseComputed from "discourse-common/utils/decorators";
+import discourseComputed, { on } from "discourse-common/utils/decorators";
-import { on } from "discourse-common/utils/decorators";
 import TextField from "discourse/components/text-field";
 import { applySearchAutocomplete } from "discourse/lib/search";
 

app/assets/javascripts/discourse/app/components/topic-list-item.js

@@ -7,7 +7,6 @@ import DiscourseURL from "discourse/lib/url";
 import { findRawTemplate } from "discourse-common/lib/raw-templates";
 import { wantsNewWindow } from "discourse/lib/intercept-click";
 import { on } from "@ember/object/evented";
-
 import { topicTitleDecorators } from "discourse/components/topic-title";
 
 export function showEntrance(e) {

app/assets/javascripts/discourse/app/controllers/bookmark.js

@@ -1,9 +1,8 @@
 import I18n from "I18n";
-import { schedule } from "@ember/runloop";
+import { schedule, next } from "@ember/runloop";
 import { and, or } from "@ember/object/computed";
-import { next } from "@ember/runloop";
 import { action } from "@ember/object";
-import { isPresent } from "@ember/utils";
+import { isPresent, isEmpty } from "@ember/utils";
 import Controller from "@ember/controller";
 import { Promise } from "rsvp";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
@@ -14,7 +13,6 @@ import KeyboardShortcuts from "discourse/lib/keyboard-shortcuts";
 import { formattedReminderTime, REMINDER_TYPES } from "discourse/lib/bookmark";
 import { AUTO_DELETE_PREFERENCES } from "discourse/models/bookmark";
 import bootbox from "bootbox";
-import { isEmpty } from "@ember/utils";
 
 // global shortcuts that interfere with these modal shortcuts, they are rebound when the
 // modal is closed

app/assets/javascripts/discourse/app/controllers/change-owner.js

@@ -3,8 +3,7 @@ import discourseComputed from "discourse-common/utils/decorators";
 import { isEmpty } from "@ember/utils";
 import { alias } from "@ember/object/computed";
 import { next } from "@ember/runloop";
-import { inject } from "@ember/controller";
+import Controller, { inject } from "@ember/controller";
-import Controller from "@ember/controller";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 import DiscourseURL from "discourse/lib/url";
 import Topic from "discourse/models/topic";

app/assets/javascripts/discourse/app/controllers/change-timestamp.js

@@ -2,8 +2,7 @@ import I18n from "I18n";
 import discourseComputed from "discourse-common/utils/decorators";
 import { isEmpty } from "@ember/utils";
 import { next } from "@ember/runloop";
-import { inject } from "@ember/controller";
+import Controller, { inject } from "@ember/controller";
-import Controller from "@ember/controller";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 import DiscourseURL from "discourse/lib/url";
 import Topic from "discourse/models/topic";

app/assets/javascripts/discourse/app/controllers/composer.js

@@ -4,12 +4,10 @@ import { isEmpty } from "@ember/utils";
 import { and, or, alias, reads } from "@ember/object/computed";
 import { cancel, debounce, run } from "@ember/runloop";
 import { inject as service } from "@ember/service";
-import { inject } from "@ember/controller";
+import Controller, { inject } from "@ember/controller";
-import Controller from "@ember/controller";
 import DiscourseURL from "discourse/lib/url";
 import { buildQuote } from "discourse/lib/quote";
 import Draft from "discourse/models/draft";
-import Composer from "discourse/models/composer";
 import discourseComputed, {
   observes,
   on,
@@ -22,7 +20,7 @@ import {
 } from "discourse/lib/uploads";
 import { emojiUnescape } from "discourse/lib/text";
 import { shortDate } from "discourse/lib/formatter";
-import { SAVE_LABELS, SAVE_ICONS } from "discourse/models/composer";
+import Composer, { SAVE_LABELS, SAVE_ICONS } from "discourse/models/composer";
 import { Promise } from "rsvp";
 import { isTesting } from "discourse-common/config/environment";
 import EmberObject, { computed, action } from "@ember/object";

app/assets/javascripts/discourse/app/controllers/discovery-sortable.js

@@ -1,5 +1,4 @@
-import { inject } from "@ember/controller";
+import Controller, { inject } from "@ember/controller";
-import Controller from "@ember/controller";
 
 // Just add query params here to have them automatically passed to topic list filters.
 export const queryParams = {

app/assets/javascripts/discourse/app/controllers/feature-topic.js

@@ -1,7 +1,6 @@
 import I18n from "I18n";
 import discourseComputed from "discourse-common/utils/decorators";
-import { inject } from "@ember/controller";
+import Controller, { inject } from "@ember/controller";
-import Controller from "@ember/controller";
 import { ajax } from "discourse/lib/ajax";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 import { categoryLinkHTML } from "discourse/helpers/category-link";

app/assets/javascripts/discourse/app/controllers/grant-badge.js

@@ -1,7 +1,6 @@
 import I18n from "I18n";
 import discourseComputed from "discourse-common/utils/decorators";
-import { inject } from "@ember/controller";
+import Controller, { inject } from "@ember/controller";
-import Controller from "@ember/controller";
 import { extractError } from "discourse/lib/ajax-error";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 import GrantBadgeController from "discourse/mixins/grant-badge-controller";

app/assets/javascripts/discourse/app/controllers/history.js

@@ -1,11 +1,13 @@
 import I18n from "I18n";
-import discourseComputed from "discourse-common/utils/decorators";
+import discourseComputed, {
+  on,
+  observes,
+} from "discourse-common/utils/decorators";
 import { alias, gt, not, or, equal } from "@ember/object/computed";
 import Controller from "@ember/controller";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 import { categoryBadgeHTML } from "discourse/helpers/category-link";
 import { propertyGreaterThan, propertyLessThan } from "discourse/lib/computed";
-import { on, observes } from "discourse-common/utils/decorators";
 import { sanitizeAsync } from "discourse/lib/text";
 import { iconHTML } from "discourse-common/lib/icon-library";
 import Post from "discourse/models/post";

app/assets/javascripts/discourse/app/controllers/move-to-topic.js

@@ -2,8 +2,7 @@ import I18n from "I18n";
 import { isEmpty } from "@ember/utils";
 import { alias, equal } from "@ember/object/computed";
 import { next } from "@ember/runloop";
-import { inject } from "@ember/controller";
+import Controller, { inject } from "@ember/controller";
-import Controller from "@ember/controller";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 import { movePosts, mergeTopic } from "discourse/models/topic";
 import DiscourseURL from "discourse/lib/url";

app/assets/javascripts/discourse/app/controllers/password-reset.js

@@ -3,10 +3,9 @@ import I18n from "I18n";
 import { alias, or, readOnly } from "@ember/object/computed";
 import Controller from "@ember/controller";
 import discourseComputed from "discourse-common/utils/decorators";
-import DiscourseURL from "discourse/lib/url";
+import DiscourseURL, { userPath } from "discourse/lib/url";
 import { ajax } from "discourse/lib/ajax";
 import PasswordValidation from "discourse/mixins/password-validation";
-import { userPath } from "discourse/lib/url";
 import { SECOND_FACTOR_METHODS } from "discourse/models/user";
 import { getWebauthnCredential } from "discourse/lib/webauthn";
 

app/assets/javascripts/discourse/app/controllers/preferences/interface.js

@@ -1,7 +1,5 @@
 import I18n from "I18n";
-import { inject } from "@ember/controller";
+import Controller, { inject } from "@ember/controller";
-import Controller from "@ember/controller";
-import { setDefaultHomepage } from "discourse/lib/utilities";
 import discourseComputed from "discourse-common/utils/decorators";
 import { listThemes, setLocalTheme } from "discourse/lib/theme-selector";
 import {
@@ -15,6 +13,7 @@ import {
   safariHacksDisabled,
   isiPad,
   iOSWithVisualViewport,
+  setDefaultHomepage,
 } from "discourse/lib/utilities";
 import { computed } from "@ember/object";
 import { reads } from "@ember/object/computed";

app/assets/javascripts/discourse/app/controllers/preferences/username.js

@@ -4,8 +4,7 @@ import { empty, or } from "@ember/object/computed";
 import Controller from "@ember/controller";
 import discourseComputed, { observes } from "discourse-common/utils/decorators";
 import { setting, propertyEqual } from "discourse/lib/computed";
-import DiscourseURL from "discourse/lib/url";
+import DiscourseURL, { userPath } from "discourse/lib/url";
-import { userPath } from "discourse/lib/url";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 import User from "discourse/models/user";
 import bootbox from "bootbox";

app/assets/javascripts/discourse/app/controllers/topic.js

@@ -6,7 +6,7 @@ import { next, schedule, later } from "@ember/runloop";
 import Controller, { inject as controller } from "@ember/controller";
 import { bufferedProperty } from "discourse/mixins/buffered-content";
 import Composer from "discourse/models/composer";
-import DiscourseURL from "discourse/lib/url";
+import DiscourseURL, { userPath } from "discourse/lib/url";
 import Post from "discourse/models/post";
 import { buildQuote } from "discourse/lib/quote";
 import QuoteState from "discourse/lib/quote-state";
@@ -18,7 +18,6 @@ import discourseComputed, { observes } from "discourse-common/utils/decorators";
 import { extractLinkMeta } from "discourse/lib/render-topic-featured-link";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 import { spinnerHTML } from "discourse/helpers/loading-spinner";
-import { userPath } from "discourse/lib/url";
 import showModal from "discourse/lib/show-modal";
 import TopicTimer from "discourse/models/topic-timer";
 import { Promise } from "rsvp";

app/assets/javascripts/discourse/app/controllers/user-activity-bookmarks.js

@@ -1,7 +1,6 @@
 import I18n from "I18n";
-import Controller from "@ember/controller";
+import Controller, { inject } from "@ember/controller";
 import { Promise } from "rsvp";
-import { inject } from "@ember/controller";
 import { action } from "@ember/object";
 import discourseComputed from "discourse-common/utils/decorators";
 import Bookmark from "discourse/models/bookmark";

app/assets/javascripts/discourse/app/controllers/user-summary.js

@@ -1,7 +1,6 @@
 import discourseComputed from "discourse-common/utils/decorators";
 import { alias } from "@ember/object/computed";
-import { inject } from "@ember/controller";
+import Controller, { inject } from "@ember/controller";
-import Controller from "@ember/controller";
 import { durationTiny } from "discourse/lib/formatter";
 
 // should be kept in sync with 'UserSummary::MAX_BADGES'

app/assets/javascripts/discourse/app/controllers/user.js

@@ -3,8 +3,7 @@ import { isEmpty } from "@ember/utils";
 import { alias, or, gt, not, and } from "@ember/object/computed";
 import EmberObject, { set, computed } from "@ember/object";
 import { inject as service } from "@ember/service";
-import { inject } from "@ember/controller";
+import Controller, { inject } from "@ember/controller";
-import Controller from "@ember/controller";
 import CanCheckEmails from "discourse/mixins/can-check-emails";
 import User from "discourse/models/user";
 import optionalService from "discourse/lib/optional-service";

app/assets/javascripts/discourse/app/helpers/node.js

@@ -1,6 +1,5 @@
 import { h } from "virtual-dom";
-import { relativeAge, longDate } from "discourse/lib/formatter";
+import { relativeAge, longDate, number } from "discourse/lib/formatter";
-import { number } from "discourse/lib/formatter";
 
 export function dateNode(dt) {
   if (typeof dt === "string") {

app/assets/javascripts/discourse/app/initializers/register-service-worker.js

@@ -1,5 +1,4 @@
-import { isAbsoluteURL } from "discourse-common/lib/get-url";
+import getAbsoluteURL, { isAbsoluteURL } from "discourse-common/lib/get-url";
-import getAbsoluteURL from "discourse-common/lib/get-url";
 
 export default {
   name: "register-service-worker",

app/assets/javascripts/discourse/app/lib/keyboard-shortcuts.js

@@ -1,9 +1,8 @@
-import { later, run } from "@ember/runloop";
+import { later, run, throttle, schedule } from "@ember/runloop";
 import DiscourseURL from "discourse/lib/url";
 import Composer from "discourse/models/composer";
 import { minimumOffset } from "discourse/lib/offset-calculator";
 import { ajax } from "discourse/lib/ajax";
-import { throttle, schedule } from "@ember/runloop";
 import { INPUT_DELAY } from "discourse-common/config/environment";
 import {
   nextTopicUrl,

app/assets/javascripts/discourse/app/lib/lightbox.js

@@ -1,8 +1,11 @@
 import I18n from "I18n";
 import loadScript from "discourse/lib/load-script";
-import { escapeExpression } from "discourse/lib/utilities";
+import {
+  escapeExpression,
+  isAppWebview,
+  postRNWebviewMessage,
+} from "discourse/lib/utilities";
 import { renderIcon } from "discourse-common/lib/icon-library";
-import { isAppWebview, postRNWebviewMessage } from "discourse/lib/utilities";
 import { spinnerHTML } from "discourse/helpers/loading-spinner";
 import User from "discourse/models/user";
 

app/assets/javascripts/discourse/app/lib/load-script.js

@@ -1,4 +1,4 @@
-import { default as getURL, getURLWithCDN } from "discourse-common/lib/get-url";
+import getURL, { getURLWithCDN } from "discourse-common/lib/get-url";
 import { run } from "@ember/runloop";
 import { ajax } from "discourse/lib/ajax";
 import { PUBLIC_JS_VERSIONS } from "discourse/lib/public-js-versions";

app/assets/javascripts/discourse/app/lib/plugin-api.js

@@ -1,9 +1,7 @@
 import deprecated from "discourse-common/lib/deprecated";
-import { iconNode } from "discourse-common/lib/icon-library";
 import { addDecorator } from "discourse/widgets/post-cooked";
 import { addPluginOutletDecorator } from "discourse/components/plugin-connector";
 import { addTopicTitleDecorator } from "discourse/components/topic-title";
-import ComposerEditor from "discourse/components/composer-editor";
 import DiscourseBanner from "discourse/components/discourse-banner";
 import { addButton, removeButton } from "discourse/widgets/post-menu";
 import { includeAttributes } from "discourse/lib/transform-post";
@@ -16,8 +14,12 @@ import {
   reopenWidget,
   decorateWidget,
   changeSetting,
+  queryRegistry,
 } from "discourse/widgets/widget";
-import { preventCloak } from "discourse/widgets/post-stream";
+import {
+  preventCloak,
+  addPostTransformCallback,
+} from "discourse/widgets/post-stream";
 import { h } from "virtual-dom";
 import { addPopupMenuOptionsCallback } from "discourse/controllers/composer";
 import { extraConnectorClass } from "discourse/lib/plugin-connectors";
@@ -27,7 +29,6 @@ import { addDiscoveryQueryParam } from "discourse/controllers/discovery-sortable
 import { addTagsHtmlCallback } from "discourse/lib/render-tags";
 import { addUserMenuGlyph } from "discourse/widgets/user-menu";
 import { addPostClassesCallback } from "discourse/widgets/post";
-import { addPostTransformCallback } from "discourse/widgets/post-stream";
 import {
   attachAdditionalPanel,
   addToHeaderIcons,
@@ -35,8 +36,8 @@ import {
 import {
   registerIconRenderer,
   replaceIcon,
+  iconNode,
 } from "discourse-common/lib/icon-library";
-import { replaceCategoryLinkRenderer } from "discourse/helpers/category-link";
 import { replaceTagRenderer } from "discourse/lib/render-tag";
 import { addNavItem } from "discourse/models/nav-item";
 import { replaceFormatter } from "discourse/lib/utilities";
@@ -47,13 +48,15 @@ import { addUsernameSelectorDecorator } from "discourse/helpers/decorate-usernam
 import { disableNameSuppression } from "discourse/widgets/poster-name";
 import { registerCustomPostMessageCallback as registerCustomPostMessageCallback1 } from "discourse/controllers/topic";
 import Sharing from "discourse/lib/sharing";
-import {
+import ComposerEditor, {
   addComposerUploadHandler,
   addComposerUploadMarkdownResolver,
 } from "discourse/components/composer-editor";
 import { addCategorySortCriteria } from "discourse/components/edit-category-settings";
-import { addExtraIconRenderer } from "discourse/helpers/category-link";
+import {
-import { queryRegistry } from "discourse/widgets/widget";
+  addExtraIconRenderer,
+  replaceCategoryLinkRenderer,
+} from "discourse/helpers/category-link";
 import Composer from "discourse/models/composer";
 import { on } from "@ember/object/evented";
 import { addQuickAccessProfileItem } from "discourse/widgets/quick-access-profile";

app/assets/javascripts/discourse/app/lib/url.js

@@ -5,7 +5,7 @@ import offsetCalculator from "discourse/lib/offset-calculator";
 import LockOn from "discourse/lib/lock-on";
 import { defaultHomepage } from "discourse/lib/utilities";
 import User from "discourse/models/user";
-import { default as getURL, withoutPrefix } from "discourse-common/lib/get-url";
+import getURL, { withoutPrefix } from "discourse-common/lib/get-url";
 import Session from "discourse/models/session";
 import { setOwner } from "@ember/application";
 

app/assets/javascripts/discourse/app/lib/utilities.js

@@ -2,7 +2,7 @@ import I18n from "I18n";
 import { escape } from "pretty-text/sanitizer";
 import toMarkdown from "discourse/lib/to-markdown";
 import Handlebars from "handlebars";
-import { default as getURL, getURLWithCDN } from "discourse-common/lib/get-url";
+import getURL, { getURLWithCDN } from "discourse-common/lib/get-url";
 import { helperContext } from "discourse-common/lib/helpers";
 import { deepMerge } from "discourse-common/lib/object";
 

app/assets/javascripts/discourse/app/models/category.js

@@ -1,9 +1,8 @@
 import getURL from "discourse-common/lib/get-url";
-import discourseComputed from "discourse-common/utils/decorators";
+import discourseComputed, { on } from "discourse-common/utils/decorators";
 import { get } from "@ember/object";
 import { ajax } from "discourse/lib/ajax";
 import RestModel from "discourse/models/rest";
-import { on } from "discourse-common/utils/decorators";
 import PermissionType from "discourse/models/permission-type";
 import { NotificationLevels } from "discourse/lib/notification-levels";
 import Site from "discourse/models/site";

app/assets/javascripts/discourse/app/models/user-action.js

@@ -1,7 +1,6 @@
-import discourseComputed from "discourse-common/utils/decorators";
+import discourseComputed, { on } from "discourse-common/utils/decorators";
 import { or, equal, and } from "@ember/object/computed";
 import RestModel from "discourse/models/rest";
-import { on } from "discourse-common/utils/decorators";
 import UserActionGroup from "discourse/models/user-action-group";
 import { postUrl } from "discourse/lib/utilities";
 import { userPath } from "discourse/lib/url";

app/assets/javascripts/discourse/app/models/user.js

@@ -1,5 +1,4 @@
-import { getURLWithCDN } from "discourse-common/lib/get-url";
+import getURL, { getURLWithCDN } from "discourse-common/lib/get-url";
-import getURL from "discourse-common/lib/get-url";
 import I18n from "I18n";
 import { A } from "@ember/array";
 import { isEmpty } from "@ember/utils";
@@ -22,14 +21,13 @@ import UserDraftsStream from "discourse/models/user-drafts-stream";
 import Group from "discourse/models/group";
 import { emojiUnescape } from "discourse/lib/text";
 import PreloadStore from "discourse/lib/preload-store";
-import { defaultHomepage } from "discourse/lib/utilities";
+import { defaultHomepage, escapeExpression } from "discourse/lib/utilities";
 import { userPath } from "discourse/lib/url";
 import Category from "discourse/models/category";
 import { Promise } from "rsvp";
 import deprecated from "discourse-common/lib/deprecated";
 import Site from "discourse/models/site";
 import { NotificationLevels } from "discourse/lib/notification-levels";
-import { escapeExpression } from "discourse/lib/utilities";
 import { getOwner } from "discourse-common/lib/get-owner";
 import cookie, { removeCookie } from "discourse/lib/cookie";
 

app/assets/javascripts/discourse/app/routes/topic.js

@@ -6,11 +6,10 @@ import DiscourseURL from "discourse/lib/url";
 import { ID_CONSTRAINT } from "discourse/models/topic";
 import { setTopicId } from "discourse/lib/topic-list-tracker";
 import { inject as service } from "@ember/service";
+import showModal from "discourse/lib/show-modal";
 
 const SCROLL_DELAY = 500;
 
-import showModal from "discourse/lib/show-modal";
-
 const TopicRoute = DiscourseRoute.extend({
   screenTrack: service(),
 

app/assets/javascripts/discourse/app/services/document-title.js

@@ -1,5 +1,4 @@
-import Service from "@ember/service";
+import Service, { inject as service } from "@ember/service";
-import { inject as service } from "@ember/service";
 import getURL from "discourse-common/lib/get-url";
 import updateTabCount from "discourse/lib/update-tab-count";
 

app/assets/javascripts/discourse/app/widgets/default-notification-item.js

@@ -3,7 +3,6 @@ import { isEmpty } from "@ember/utils";
 import { wantsNewWindow } from "discourse/lib/intercept-click";
 import RawHtml from "discourse/widgets/raw-html";
 import { createWidget } from "discourse/widgets/widget";
-import DiscourseURL from "discourse/lib/url";
 import { h } from "virtual-dom";
 import { emojiUnescape } from "discourse/lib/text";
 import {
@@ -11,10 +10,9 @@ import {
   escapeExpression,
   formatUsername,
 } from "discourse/lib/utilities";
-import { setTransientHeader } from "discourse/lib/ajax";
+import DiscourseURL, { userPath } from "discourse/lib/url";
-import { userPath } from "discourse/lib/url";
 import { iconNode } from "discourse-common/lib/icon-library";
-import { ajax } from "discourse/lib/ajax";
+import { ajax, setTransientHeader } from "discourse/lib/ajax";
 import getURL from "discourse-common/lib/get-url";
 
 export const DefaultNotificationItem = createWidget(

app/assets/javascripts/discourse/app/widgets/hamburger-menu.js

@@ -3,9 +3,8 @@ import I18n from "I18n";
 import { later } from "@ember/runloop";
 import { createWidget, applyDecorators } from "discourse/widgets/widget";
 import { h } from "virtual-dom";
-import DiscourseURL from "discourse/lib/url";
+import DiscourseURL, { userPath } from "discourse/lib/url";
 import { ajax } from "discourse/lib/ajax";
-import { userPath } from "discourse/lib/url";
 import { wantsNewWindow } from "discourse/lib/intercept-click";
 import { NotificationLevels } from "discourse/lib/notification-levels";
 

app/assets/javascripts/discourse/app/widgets/post-cooked.js

@@ -4,10 +4,7 @@ import { ajax } from "discourse/lib/ajax";
 import { isValidLink } from "discourse/lib/click-track";
 import { number } from "discourse/lib/formatter";
 import highlightSearch from "discourse/lib/highlight-search";
-import {
+import highlightHTML, { unhighlightHTML } from "discourse/lib/highlight-html";
-  default as highlightHTML,
-  unhighlightHTML,
-} from "discourse/lib/highlight-html";
 import { spinnerHTML } from "discourse/helpers/loading-spinner";
 
 let _beforeAdoptDecorators = [];

app/assets/javascripts/discourse/app/widgets/post.js

@@ -1,4 +1,4 @@
-import { default as getURL, getURLWithCDN } from "discourse-common/lib/get-url";
+import getURL, { getURLWithCDN } from "discourse-common/lib/get-url";
 import I18n from "I18n";
 import PostCooked from "discourse/widgets/post-cooked";
 import DecoratorHelper from "discourse/widgets/decorator-helper";

app/assets/javascripts/discourse/tests/acceptance/about-test.js

@@ -1,7 +1,6 @@
-import { exists } from "discourse/tests/helpers/qunit-helpers";
+import { exists, acceptance } from "discourse/tests/helpers/qunit-helpers";
 import { visit } from "@ember/test-helpers";
 import { test } from "qunit";
-import { acceptance } from "discourse/tests/helpers/qunit-helpers";
 
 acceptance("About", function () {
   test("viewing", async function (assert) {

app/assets/javascripts/discourse/tests/acceptance/account-created-test.js

@@ -1,8 +1,10 @@
-import { queryAll } from "discourse/tests/helpers/qunit-helpers";
+import {
-import { exists } from "discourse/tests/helpers/qunit-helpers";
+  queryAll,
+  exists,
+  acceptance,
+} from "discourse/tests/helpers/qunit-helpers";
 import { visit, click, fillIn, currentRouteName } from "@ember/test-helpers";
 import { test } from "qunit";
-import { acceptance } from "discourse/tests/helpers/qunit-helpers";
 import PreloadStore from "discourse/lib/preload-store";
 
 acceptance("Account Created", function () {

app/assets/javascripts/discourse/tests/acceptance/admin-emails-test.js

@@ -1,7 +1,6 @@
-import { queryAll } from "discourse/tests/helpers/qunit-helpers";
+import { queryAll, acceptance } from "discourse/tests/helpers/qunit-helpers";
 import { fillIn, click, visit } from "@ember/test-helpers";
 import { test } from "qunit";
-import { acceptance } from "discourse/tests/helpers/qunit-helpers";
 
 const EMAIL = `
 From: "somebody" <somebody@example.com>

app/assets/javascripts/discourse/tests/acceptance/admin-search-log-term-test.js

@@ -1,7 +1,6 @@
-import { exists } from "discourse/tests/helpers/qunit-helpers";
+import { exists, acceptance } from "discourse/tests/helpers/qunit-helpers";
 import { visit } from "@ember/test-helpers";
 import { test } from "qunit";
-import { acceptance } from "discourse/tests/helpers/qunit-helpers";
 
 acceptance("Admin - Search Log Term", function (needs) {
   needs.user();

app/assets/javascripts/discourse/tests/acceptance/admin-search-logs-test.js

@@ -1,7 +1,6 @@
-import { exists } from "discourse/tests/helpers/qunit-helpers";
+import { exists, acceptance } from "discourse/tests/helpers/qunit-helpers";
 import { click, visit } from "@ember/test-helpers";
 import { test } from "qunit";
-import { acceptance } from "discourse/tests/helpers/qunit-helpers";
 
 acceptance("Admin - Search Logs", function (needs) {
   needs.user();

app/assets/javascripts/discourse/tests/acceptance/admin-site-settings-test.js

@@ -1,5 +1,3 @@
-import { queryAll } from "discourse/tests/helpers/qunit-helpers";
-import { exists } from "discourse/tests/helpers/qunit-helpers";
 import {
   fillIn,
   click,
@@ -8,7 +6,12 @@ import {
   currentURL,
 } from "@ember/test-helpers";
 import { test } from "qunit";
-import { acceptance, count } from "discourse/tests/helpers/qunit-helpers";
+import {
+  acceptance,
+  count,
+  queryAll,
+  exists,
+} from "discourse/tests/helpers/qunit-helpers";
 import siteSettingFixture from "discourse/tests/fixtures/site-settings";
 
 acceptance("Admin - Site Settings", function (needs) {

app/assets/javascripts/discourse/tests/acceptance/admin-site-text-test.js

@@ -1,8 +1,10 @@
-import { queryAll } from "discourse/tests/helpers/qunit-helpers";
+import {
-import { exists } from "discourse/tests/helpers/qunit-helpers";
+  queryAll,
+  exists,
+  acceptance,
+} from "discourse/tests/helpers/qunit-helpers";
 import { fillIn, click, visit, currentURL } from "@ember/test-helpers";
 import { test } from "qunit";
-import { acceptance } from "discourse/tests/helpers/qunit-helpers";
 
 acceptance("Admin - Site Texts", function (needs) {
   needs.user();

app/assets/javascripts/discourse/tests/acceptance/admin-suspend-user-test.js

@@ -1,9 +1,11 @@
-import { queryAll } from "discourse/tests/helpers/qunit-helpers";
+import {
-import { exists } from "discourse/tests/helpers/qunit-helpers";
+  queryAll,
+  exists,
+  acceptance,
+} from "discourse/tests/helpers/qunit-helpers";
 import { visit, click, fillIn } from "@ember/test-helpers";
 import { test } from "qunit";
 import selectKit from "discourse/tests/helpers/select-kit-helper";
-import { acceptance } from "discourse/tests/helpers/qunit-helpers";
 
 acceptance("Admin - Suspend User", function (needs) {
   needs.user();

app/assets/javascripts/discourse/tests/acceptance/admin-user-badges-test.js

@@ -1,7 +1,6 @@
-import { exists } from "discourse/tests/helpers/qunit-helpers";
+import { exists, acceptance } from "discourse/tests/helpers/qunit-helpers";
 import { visit } from "@ember/test-helpers";
 import { test } from "qunit";
-import { acceptance } from "discourse/tests/helpers/qunit-helpers";
 
 acceptance("Admin - Users Badges", function (needs) {
   needs.user();

app/assets/javascripts/discourse/tests/acceptance/admin-user-emails-test.js

@@ -1,8 +1,7 @@
-import { queryAll } from "discourse/tests/helpers/qunit-helpers";
+import { queryAll, acceptance } from "discourse/tests/helpers/qunit-helpers";
 import { click, visit } from "@ember/test-helpers";
 import { test } from "qunit";
 import I18n from "I18n";
-import { acceptance } from "discourse/tests/helpers/qunit-helpers";
 
 function assertNoSecondary(assert) {
   assert.equal(

app/assets/javascripts/discourse/tests/acceptance/admin-user-index-test.js

@@ -1,8 +1,7 @@
-import { queryAll } from "discourse/tests/helpers/qunit-helpers";
+import { queryAll, acceptance } from "discourse/tests/helpers/qunit-helpers";
 import { click, fillIn, visit } from "@ember/test-helpers";
 import { test } from "qunit";
 import selectKit from "discourse/tests/helpers/select-kit-helper";
-import { acceptance } from "discourse/tests/helpers/qunit-helpers";
 
 acceptance("Admin - User Index", function (needs) {
   needs.user();

app/assets/javascripts/discourse/tests/acceptance/admin-users-list-test.js

@@ -1,9 +1,11 @@
-import { queryAll } from "discourse/tests/helpers/qunit-helpers";
+import {
-import { exists } from "discourse/tests/helpers/qunit-helpers";
+  queryAll,
+  exists,
+  acceptance,
+} from "discourse/tests/helpers/qunit-helpers";
 import { click, visit } from "@ember/test-helpers";
 import { test } from "qunit";
 import I18n from "I18n";
-import { acceptance } from "discourse/tests/helpers/qunit-helpers";
 
 acceptance("Admin - Users List", function (needs) {
   needs.user();

app/assets/javascripts/discourse/tests/acceptance/admin-watched-words-test.js

@@ -1,8 +1,10 @@
-import { queryAll } from "discourse/tests/helpers/qunit-helpers";
+import {
-import { exists } from "discourse/tests/helpers/qunit-helpers";
+  queryAll,
+  exists,
+  acceptance,
+} from "discourse/tests/helpers/qunit-helpers";
 import { fillIn, click, visit } from "@ember/test-helpers";
 import { test } from "qunit";
-import { acceptance } from "discourse/tests/helpers/qunit-helpers";
 
 acceptance("Admin - Watched Words", function (needs) {
   needs.user();

app/assets/javascripts/discourse/tests/acceptance/auth-complete-test.js

@@ -1,7 +1,6 @@
-import { exists } from "discourse/tests/helpers/qunit-helpers";
+import { exists, acceptance } from "discourse/tests/helpers/qunit-helpers";
 import { visit, currentRouteName } from "@ember/test-helpers";
 import { test } from "qunit";
-import { acceptance } from "discourse/tests/helpers/qunit-helpers";
 
 acceptance("Auth Complete", function (needs) {
   needs.hooks.beforeEach(() => {

app/assets/javascripts/discourse/tests/acceptance/badges-test.js

@@ -1,8 +1,7 @@
-import { exists } from "discourse/tests/helpers/qunit-helpers";
+import { exists, acceptance } from "discourse/tests/helpers/qunit-helpers";
 import { visit } from "@ember/test-helpers";
 import { test } from "qunit";
 import selectKit from "discourse/tests/helpers/select-kit-helper";
-import { acceptance } from "discourse/tests/helpers/qunit-helpers";
 
 acceptance("Badges", function (needs) {
   needs.user();

app/assets/javascripts/discourse/tests/acceptance/bookmarks-test.js

@@ -1,5 +1,3 @@
-import { queryAll } from "discourse/tests/helpers/qunit-helpers";
-import { exists } from "discourse/tests/helpers/qunit-helpers";
 import { click, fillIn, visit } from "@ember/test-helpers";
 import { test } from "qunit";
 import I18n from "I18n";
@@ -7,6 +5,8 @@ import selectKit from "discourse/tests/helpers/select-kit-helper";
 import {
   acceptance,
   loggedInUser,
+  queryAll,
+  exists,
 } from "discourse/tests/helpers/qunit-helpers";
 
 async function openBookmarkModal() {

app/assets/javascripts/discourse/tests/acceptance/category-banner-test.js

@@ -1,7 +1,10 @@
-import { queryAll } from "discourse/tests/helpers/qunit-helpers";
+import {
+  queryAll,
+  acceptance,
+  visible,
+} from "discourse/tests/helpers/qunit-helpers";
 import { click, visit } from "@ember/test-helpers";
 import { test } from "qunit";
-import { acceptance, visible } from "discourse/tests/helpers/qunit-helpers";
 import DiscoveryFixtures from "discourse/tests/fixtures/discovery-fixtures";
 
 acceptance("Category Banners", function (needs) {

app/assets/javascripts/discourse/tests/acceptance/category-edit-security-test.js

@@ -1,8 +1,7 @@
-import { queryAll } from "discourse/tests/helpers/qunit-helpers";
+import { queryAll, acceptance } from "discourse/tests/helpers/qunit-helpers";
 import { click, visit } from "@ember/test-helpers";
 import { test } from "qunit";
 import selectKit from "discourse/tests/helpers/select-kit-helper";
-import { acceptance } from "discourse/tests/helpers/qunit-helpers";
 import I18n from "I18n";
 
 acceptance("Category Edit - security", function (needs) {

app/assets/javascripts/discourse/tests/acceptance/category-edit-test.js

@@ -1,10 +1,13 @@
-import { queryAll } from "discourse/tests/helpers/qunit-helpers";
+import {
+  queryAll,
+  acceptance,
+  visible,
+} from "discourse/tests/helpers/qunit-helpers";
 import { click, fillIn, visit, currentURL } from "@ember/test-helpers";
 import { test } from "qunit";
 import selectKit from "discourse/tests/helpers/select-kit-helper";
 import DiscourseURL from "discourse/lib/url";
 import sinon from "sinon";
-import { acceptance, visible } from "discourse/tests/helpers/qunit-helpers";
 
 acceptance("Category Edit", function (needs) {
   needs.user();

app/assets/javascripts/discourse/tests/acceptance/category-new-test.js

@@ -1,7 +1,6 @@
-import { queryAll } from "discourse/tests/helpers/qunit-helpers";
+import { queryAll, acceptance } from "discourse/tests/helpers/qunit-helpers";
 import { fillIn, click, visit } from "@ember/test-helpers";
 import { test } from "qunit";
-import { acceptance } from "discourse/tests/helpers/qunit-helpers";
 import I18n from "I18n";
 import DiscourseURL from "discourse/lib/url";
 import sinon from "sinon";

app/assets/javascripts/discourse/tests/acceptance/click-track-test.js

@@ -1,7 +1,6 @@
-import { queryAll } from "discourse/tests/helpers/qunit-helpers";
+import { queryAll, acceptance } from "discourse/tests/helpers/qunit-helpers";
 import { click, visit, currentURL } from "@ember/test-helpers";
 import { test } from "qunit";
-import { acceptance } from "discourse/tests/helpers/qunit-helpers";
 
 acceptance("Click Track", function (needs) {
   let tracked = false;

app/assets/javascripts/discourse/tests/acceptance/composer-actions-test.js

@@ -1,5 +1,3 @@
-import { queryAll } from "discourse/tests/helpers/qunit-helpers";
-import { exists } from "discourse/tests/helpers/qunit-helpers";
 import { click, fillIn, visit } from "@ember/test-helpers";
 import { test } from "qunit";
 import I18n from "I18n";
@@ -7,6 +5,8 @@ import selectKit from "discourse/tests/helpers/select-kit-helper";
 import {
   acceptance,
   updateCurrentUser,
+  queryAll,
+  exists,
 } from "discourse/tests/helpers/qunit-helpers";
 import { _clearSnapshots } from "select-kit/components/composer-actions";
 import { toggleCheckDraftPopup } from "discourse/controllers/composer";

app/assets/javascripts/discourse/tests/acceptance/composer-attachment-test.js

@@ -1,7 +1,6 @@
-import { queryAll } from "discourse/tests/helpers/qunit-helpers";
+import { queryAll, acceptance } from "discourse/tests/helpers/qunit-helpers";
 import { click, fillIn, visit } from "@ember/test-helpers";
 import { test } from "qunit";
-import { acceptance } from "discourse/tests/helpers/qunit-helpers";
 
 function pretender(server, helper) {
   server.post("/uploads/lookup-urls", () => {

app/assets/javascripts/discourse/tests/acceptance/composer-edit-conflict-test.js

@@ -1,8 +1,7 @@
-import { queryAll } from "discourse/tests/helpers/qunit-helpers";
+import { queryAll, acceptance } from "discourse/tests/helpers/qunit-helpers";
 import { click, fillIn, visit } from "@ember/test-helpers";
 import { test } from "qunit";
 import I18n from "I18n";
-import { acceptance } from "discourse/tests/helpers/qunit-helpers";
 
 acceptance("Composer - Edit conflict", function (needs) {
   needs.user();

app/assets/javascripts/discourse/tests/acceptance/composer-hyperlink-test.js

@@ -1,8 +1,10 @@
-import { queryAll } from "discourse/tests/helpers/qunit-helpers";
+import {
-import { exists } from "discourse/tests/helpers/qunit-helpers";
+  queryAll,
+  exists,
+  acceptance,
+} from "discourse/tests/helpers/qunit-helpers";
 import { click, fillIn, triggerKeyEvent, visit } from "@ember/test-helpers";
 import { test } from "qunit";
-import { acceptance } from "discourse/tests/helpers/qunit-helpers";
 
 acceptance("Composer - Hyperlink", function (needs) {
   needs.user();

app/assets/javascripts/discourse/tests/acceptance/composer-onebox-test.js

@@ -1,7 +1,6 @@
-import { queryAll } from "discourse/tests/helpers/qunit-helpers";
+import { queryAll, acceptance } from "discourse/tests/helpers/qunit-helpers";
 import { click, fillIn, visit } from "@ember/test-helpers";
 import { test } from "qunit";
-import { acceptance } from "discourse/tests/helpers/qunit-helpers";
 
 acceptance("Composer - Onebox", function (needs) {
   needs.user();

app/assets/javascripts/discourse/tests/acceptance/composer-test.js

@@ -1,5 +1,3 @@
-import { queryAll } from "discourse/tests/helpers/qunit-helpers";
-import { exists } from "discourse/tests/helpers/qunit-helpers";
 import { click, fillIn, visit, currentURL } from "@ember/test-helpers";
 import { skip, test } from "qunit";
 import I18n from "I18n";
@@ -9,6 +7,8 @@ import {
   acceptance,
   invisible,
   visible,
+  queryAll,
+  exists,
 } from "discourse/tests/helpers/qunit-helpers";
 import { toggleCheckDraftPopup } from "discourse/controllers/composer";
 import Draft from "discourse/models/draft";

app/assets/javascripts/discourse/tests/acceptance/composer-topic-links-test.js

@@ -1,8 +1,10 @@
-import { queryAll } from "discourse/tests/helpers/qunit-helpers";
+import {
-import { exists } from "discourse/tests/helpers/qunit-helpers";
+  queryAll,
+  exists,
+  acceptance,
+} from "discourse/tests/helpers/qunit-helpers";
 import { click, fillIn, visit } from "@ember/test-helpers";
 import { test } from "qunit";
-import { acceptance } from "discourse/tests/helpers/qunit-helpers";
 
 acceptance("Composer topic featured links", function (needs) {
   needs.user();

app/assets/javascripts/discourse/tests/acceptance/composer-uncategorized-test.js

@@ -1,9 +1,11 @@
-import { queryAll } from "discourse/tests/helpers/qunit-helpers";
+import {
-import { exists } from "discourse/tests/helpers/qunit-helpers";
+  queryAll,
+  exists,
+  acceptance,
+} from "discourse/tests/helpers/qunit-helpers";
 import { click, fillIn, visit } from "@ember/test-helpers";
 import { test } from "qunit";
 import selectKit from "discourse/tests/helpers/select-kit-helper";
-import { acceptance } from "discourse/tests/helpers/qunit-helpers";
 
 acceptance(
   "Composer disabled, uncategorized not allowed when any topic_template present",

app/assets/javascripts/discourse/tests/acceptance/create-account-external-test.js

@@ -1,7 +1,6 @@
-import { exists } from "discourse/tests/helpers/qunit-helpers";
+import { exists, acceptance } from "discourse/tests/helpers/qunit-helpers";
 import { visit } from "@ember/test-helpers";
 import { test } from "qunit";
-import { acceptance } from "discourse/tests/helpers/qunit-helpers";
 
 acceptance("Create Account - external auth", function (needs) {
   needs.hooks.beforeEach(() => {

app/assets/javascripts/discourse/tests/acceptance/create-account-user-fields-test.js

@@ -1,8 +1,10 @@
-import { queryAll } from "discourse/tests/helpers/qunit-helpers";
+import {
-import { exists } from "discourse/tests/helpers/qunit-helpers";
+  queryAll,
+  exists,
+  acceptance,
+} from "discourse/tests/helpers/qunit-helpers";
 import { click, fillIn, visit } from "@ember/test-helpers";
 import { test } from "qunit";
-import { acceptance } from "discourse/tests/helpers/qunit-helpers";
 
 acceptance("Create Account - User Fields", function (needs) {
   needs.site({

app/assets/javascripts/discourse/tests/acceptance/custom-html-set-test.js

@@ -1,8 +1,10 @@
-import { queryAll } from "discourse/tests/helpers/qunit-helpers";
+import {
-import { exists } from "discourse/tests/helpers/qunit-helpers";
+  queryAll,
+  exists,
+  acceptance,
+} from "discourse/tests/helpers/qunit-helpers";
 import { visit } from "@ember/test-helpers";
 import { test } from "qunit";
-import { acceptance } from "discourse/tests/helpers/qunit-helpers";
 import { setCustomHTML } from "discourse/helpers/custom-html";
 import PreloadStore from "discourse/lib/preload-store";
 

app/assets/javascripts/discourse/tests/acceptance/custom-html-template-test.js

@@ -1,7 +1,6 @@
-import { queryAll } from "discourse/tests/helpers/qunit-helpers";
+import { queryAll, acceptance } from "discourse/tests/helpers/qunit-helpers";
 import { visit } from "@ember/test-helpers";
 import { test } from "qunit";
-import { acceptance } from "discourse/tests/helpers/qunit-helpers";
 import Ember from "ember";
 import hbs from "htmlbars-inline-precompile";
 

app/assets/javascripts/discourse/tests/acceptance/dashboard-test.js

@@ -1,9 +1,11 @@
-import { queryAll } from "discourse/tests/helpers/qunit-helpers";
+import {
-import { exists } from "discourse/tests/helpers/qunit-helpers";
+  queryAll,
+  exists,
+  acceptance,
+} from "discourse/tests/helpers/qunit-helpers";
 import { click, fillIn, visit } from "@ember/test-helpers";
 import { test } from "qunit";
 import selectKit from "discourse/tests/helpers/select-kit-helper";
-import { acceptance } from "discourse/tests/helpers/qunit-helpers";
 
 acceptance("Dashboard", function (needs) {
   needs.user();

app/assets/javascripts/discourse/tests/acceptance/email-notice-test.js

@@ -1,9 +1,9 @@
-import { exists } from "discourse/tests/helpers/qunit-helpers";
 import { visit } from "@ember/test-helpers";
 import { test } from "qunit";
 import {
   acceptance,
   updateCurrentUser,
+  exists,
 } from "discourse/tests/helpers/qunit-helpers";
 
 acceptance("Email Disabled Banner", function (needs) {

app/assets/javascripts/discourse/tests/acceptance/emoji-picker-test.js

@@ -1,8 +1,10 @@
-import { queryAll } from "discourse/tests/helpers/qunit-helpers";
+import {
-import { exists } from "discourse/tests/helpers/qunit-helpers";
+  queryAll,
+  exists,
+  acceptance,
+} from "discourse/tests/helpers/qunit-helpers";
 import { click, fillIn, visit } from "@ember/test-helpers";
 import { test } from "qunit";
-import { acceptance } from "discourse/tests/helpers/qunit-helpers";
 
 acceptance("EmojiPicker", function (needs) {
   needs.user();

app/assets/javascripts/discourse/tests/acceptance/emoji-test.js

@@ -1,8 +1,7 @@
-import { queryAll } from "discourse/tests/helpers/qunit-helpers";
+import { queryAll, acceptance } from "discourse/tests/helpers/qunit-helpers";
 import { click, fillIn, visit } from "@ember/test-helpers";
 import { test } from "qunit";
 import { IMAGE_VERSION as v } from "pretty-text/emoji/version";
-import { acceptance } from "discourse/tests/helpers/qunit-helpers";
 
 acceptance("Emoji", function (needs) {
   needs.user();

app/assets/javascripts/discourse/tests/acceptance/encoded-category-test.js

@@ -1,7 +1,6 @@
-import { exists } from "discourse/tests/helpers/qunit-helpers";
+import { exists, acceptance } from "discourse/tests/helpers/qunit-helpers";
 import { visit } from "@ember/test-helpers";
 import { test } from "qunit";
-import { acceptance } from "discourse/tests/helpers/qunit-helpers";
 import DiscoveryFixtures from "discourse/tests/fixtures/discovery-fixtures";
 
 acceptance("Encoded Sub Category Discovery", function (needs) {

app/assets/javascripts/discourse/tests/acceptance/enforce-second-factor-test.js

@@ -1,9 +1,9 @@
-import { queryAll } from "discourse/tests/helpers/qunit-helpers";
 import { click, visit } from "@ember/test-helpers";
 import { test } from "qunit";
 import {
   acceptance,
   updateCurrentUser,
+  queryAll,
 } from "discourse/tests/helpers/qunit-helpers";
 
 acceptance("Enforce Second Factor", function (needs) {

app/assets/javascripts/discourse/tests/acceptance/flag-post-test.js

@@ -1,9 +1,11 @@
-import { queryAll } from "discourse/tests/helpers/qunit-helpers";
+import {
-import { exists } from "discourse/tests/helpers/qunit-helpers";
+  queryAll,
+  exists,
+  acceptance,
+} from "discourse/tests/helpers/qunit-helpers";
 import { click, visit } from "@ember/test-helpers";
 import { test } from "qunit";
 import selectKit from "discourse/tests/helpers/select-kit-helper";
-import { acceptance } from "discourse/tests/helpers/qunit-helpers";
 import userFixtures from "discourse/tests/fixtures/user-fixtures";
 
 async function openFlagModal() {

app/assets/javascripts/discourse/tests/acceptance/forgot-password-test.js

@@ -1,9 +1,11 @@
-import { queryAll } from "discourse/tests/helpers/qunit-helpers";
+import {
-import { exists } from "discourse/tests/helpers/qunit-helpers";
+  queryAll,
+  exists,
+  acceptance,
+} from "discourse/tests/helpers/qunit-helpers";
 import { click, fillIn, visit } from "@ember/test-helpers";
 import { test } from "qunit";
 import I18n from "I18n";
-import { acceptance } from "discourse/tests/helpers/qunit-helpers";
 
 let userFound = false;
 

app/assets/javascripts/discourse/tests/acceptance/group-index-test.js

@@ -1,4 +1,3 @@
-import { queryAll } from "discourse/tests/helpers/qunit-helpers";
 import { click, visit } from "@ember/test-helpers";
 import { test } from "qunit";
 import I18n from "I18n";
@@ -6,6 +5,7 @@ import {
   acceptance,
   updateCurrentUser,
   count,
+  queryAll,
 } from "discourse/tests/helpers/qunit-helpers";
 
 acceptance("Group Members - Anonymous", function () {

app/assets/javascripts/discourse/tests/acceptance/group-manage-categories-test.js

@@ -1,10 +1,10 @@
-import { queryAll } from "discourse/tests/helpers/qunit-helpers";
 import { visit } from "@ember/test-helpers";
 import { test } from "qunit";
 import {
   acceptance,
   updateCurrentUser,
   count,
+  queryAll,
 } from "discourse/tests/helpers/qunit-helpers";
 
 acceptance("Managing Group Category Notification Defaults", function () {

app/assets/javascripts/discourse/tests/acceptance/group-manage-interaction-test.js

@@ -1,9 +1,9 @@
-import { queryAll } from "discourse/tests/helpers/qunit-helpers";
 import { visit } from "@ember/test-helpers";
 import { test } from "qunit";
 import {
   acceptance,
   updateCurrentUser,
+  queryAll,
 } from "discourse/tests/helpers/qunit-helpers";
 
 acceptance("Managing Group Interaction Settings", function (needs) {

app/assets/javascripts/discourse/tests/acceptance/group-manage-logs-test.js

@@ -1,7 +1,6 @@
-import { queryAll } from "discourse/tests/helpers/qunit-helpers";
+import { queryAll, acceptance } from "discourse/tests/helpers/qunit-helpers";
 import { click, visit } from "@ember/test-helpers";
 import { test } from "qunit";
-import { acceptance } from "discourse/tests/helpers/qunit-helpers";
 
 acceptance("Group logs", function (needs) {
   needs.user();

app/assets/javascripts/discourse/tests/acceptance/group-manage-membership-test.js

@@ -1,9 +1,9 @@
-import { queryAll } from "discourse/tests/helpers/qunit-helpers";
 import { click, visit } from "@ember/test-helpers";
 import { test } from "qunit";
 import {
   acceptance,
   updateCurrentUser,
+  queryAll,
 } from "discourse/tests/helpers/qunit-helpers";
 import selectKit from "discourse/tests/helpers/select-kit-helper";