diff --git a/assets/javascripts/discourse/components/ad-component.js b/assets/javascripts/discourse/components/ad-component.js
index 87fef7e8..6c1cae51 100644
--- a/assets/javascripts/discourse/components/ad-component.js
+++ b/assets/javascripts/discourse/components/ad-component.js
@@ -1,6 +1,6 @@
 import Component from "@ember/component";
-import { inject as service } from "@ember/service";
 import { alias, or } from "@ember/object/computed";
+import { inject as service } from "@ember/service";
 import discourseComputed from "discourse-common/utils/decorators";
 import {
   isNthPost,
diff --git a/assets/javascripts/discourse/components/ad-slot.js b/assets/javascripts/discourse/components/ad-slot.js
index 9cfa9664..8309d4e1 100644
--- a/assets/javascripts/discourse/components/ad-slot.js
+++ b/assets/javascripts/discourse/components/ad-slot.js
@@ -1,7 +1,7 @@
 import EmberObject from "@ember/object";
-import AdComponent from "discourse/plugins/discourse-adplugin/discourse/components/ad-component";
-import discourseComputed, { observes } from "discourse-common/utils/decorators";
 import { isBlank } from "@ember/utils";
+import discourseComputed, { observes } from "discourse-common/utils/decorators";
+import AdComponent from "discourse/plugins/discourse-adplugin/discourse/components/ad-component";
 import {
   isNthPost,
   isNthTopicListItem,
diff --git a/assets/javascripts/discourse/components/adbutler-ad.js b/assets/javascripts/discourse/components/adbutler-ad.js
index fb3e7303..b9007967 100644
--- a/assets/javascripts/discourse/components/adbutler-ad.js
+++ b/assets/javascripts/discourse/components/adbutler-ad.js
@@ -1,9 +1,9 @@
-import AdComponent from "discourse/plugins/discourse-adplugin/discourse/components/ad-component";
-import discourseComputed, { observes } from "discourse-common/utils/decorators";
-import loadScript from "discourse/lib/load-script";
-import RSVP from "rsvp";
 import { scheduleOnce } from "@ember/runloop";
+import RSVP from "rsvp";
+import loadScript from "discourse/lib/load-script";
 import { isTesting } from "discourse-common/config/environment";
+import discourseComputed, { observes } from "discourse-common/utils/decorators";
+import AdComponent from "discourse/plugins/discourse-adplugin/discourse/components/ad-component";
 
 let _loaded = false,
   _promise = null,
diff --git a/assets/javascripts/discourse/components/amazon-product-links.js b/assets/javascripts/discourse/components/amazon-product-links.js
index 4721c390..571ed507 100644
--- a/assets/javascripts/discourse/components/amazon-product-links.js
+++ b/assets/javascripts/discourse/components/amazon-product-links.js
@@ -1,7 +1,7 @@
-import AdComponent from "discourse/plugins/discourse-adplugin/discourse/components/ad-component";
-import discourseComputed from "discourse-common/utils/decorators";
 import { and } from "@ember/object/computed";
 import { htmlSafe } from "@ember/template";
+import discourseComputed from "discourse-common/utils/decorators";
+import AdComponent from "discourse/plugins/discourse-adplugin/discourse/components/ad-component";
 
 export default AdComponent.extend({
   classNames: ["amazon-product-links"],
diff --git a/assets/javascripts/discourse/components/carbonads-ad.js b/assets/javascripts/discourse/components/carbonads-ad.js
index 047355b1..a9e5b95e 100644
--- a/assets/javascripts/discourse/components/carbonads-ad.js
+++ b/assets/javascripts/discourse/components/carbonads-ad.js
@@ -1,6 +1,6 @@
-import AdComponent from "discourse/plugins/discourse-adplugin/discourse/components/ad-component";
-import discourseComputed from "discourse-common/utils/decorators";
 import { htmlSafe } from "@ember/template";
+import discourseComputed from "discourse-common/utils/decorators";
+import AdComponent from "discourse/plugins/discourse-adplugin/discourse/components/ad-component";
 
 export default AdComponent.extend({
   serve_id: null,
diff --git a/assets/javascripts/discourse/components/google-adsense.js b/assets/javascripts/discourse/components/google-adsense.js
index 3734388c..2bf628b2 100644
--- a/assets/javascripts/discourse/components/google-adsense.js
+++ b/assets/javascripts/discourse/components/google-adsense.js
@@ -1,10 +1,10 @@
-import AdComponent from "discourse/plugins/discourse-adplugin/discourse/components/ad-component";
-import discourseComputed, { observes } from "discourse-common/utils/decorators";
-import loadScript from "discourse/lib/load-script";
-import RSVP from "rsvp";
 import { scheduleOnce } from "@ember/runloop";
-import { isTesting } from "discourse-common/config/environment";
 import { htmlSafe } from "@ember/template";
+import RSVP from "rsvp";
+import loadScript from "discourse/lib/load-script";
+import { isTesting } from "discourse-common/config/environment";
+import discourseComputed, { observes } from "discourse-common/utils/decorators";
+import AdComponent from "discourse/plugins/discourse-adplugin/discourse/components/ad-component";
 
 let _loaded = false,
   _promise = null,
diff --git a/assets/javascripts/discourse/components/google-dfp-ad.js b/assets/javascripts/discourse/components/google-dfp-ad.js
index 7223358c..25d4575c 100755
--- a/assets/javascripts/discourse/components/google-dfp-ad.js
+++ b/assets/javascripts/discourse/components/google-dfp-ad.js
@@ -1,10 +1,10 @@
-import AdComponent from "discourse/plugins/discourse-adplugin/discourse/components/ad-component";
-import discourseComputed, { on } from "discourse-common/utils/decorators";
-import loadScript from "discourse/lib/load-script";
 import { alias } from "@ember/object/computed";
+import { htmlSafe } from "@ember/template";
 import RSVP from "rsvp";
+import loadScript from "discourse/lib/load-script";
 import { isTesting } from "discourse-common/config/environment";
-import { htmlSafe } from "@ember/template";
+import discourseComputed, { on } from "discourse-common/utils/decorators";
+import AdComponent from "discourse/plugins/discourse-adplugin/discourse/components/ad-component";
 
 let _loaded = false,
   _promise = null,
diff --git a/assets/javascripts/discourse/components/house-ad.js b/assets/javascripts/discourse/components/house-ad.js
index f1fb4528..ea979276 100644
--- a/assets/javascripts/discourse/components/house-ad.js
+++ b/assets/javascripts/discourse/components/house-ad.js
@@ -1,6 +1,6 @@
-import AdComponent from "discourse/plugins/discourse-adplugin/discourse/components/ad-component";
-import discourseComputed, { observes } from "discourse-common/utils/decorators";
 import { isBlank } from "@ember/utils";
+import discourseComputed, { observes } from "discourse-common/utils/decorators";
+import AdComponent from "discourse/plugins/discourse-adplugin/discourse/components/ad-component";
 
 const adIndex = {
   topic_list_top: null,
diff --git a/assets/javascripts/discourse/components/house-ads-chooser.js b/assets/javascripts/discourse/components/house-ads-chooser.js
index 3cf6f7b7..85e4c0ca 100644
--- a/assets/javascripts/discourse/components/house-ads-chooser.js
+++ b/assets/javascripts/discourse/components/house-ads-chooser.js
@@ -1,5 +1,5 @@
-import MultiSelectComponent from "select-kit/components/multi-select";
 import Ember from "ember";
+import MultiSelectComponent from "select-kit/components/multi-select";
 const { makeArray } = Ember;
 import { computed } from "@ember/object";
 
diff --git a/assets/javascripts/discourse/components/house-ads-list-setting.js b/assets/javascripts/discourse/components/house-ads-list-setting.js
index 6ece8cc5..152851ad 100644
--- a/assets/javascripts/discourse/components/house-ads-list-setting.js
+++ b/assets/javascripts/discourse/components/house-ads-list-setting.js
@@ -1,5 +1,5 @@
-import HouseAdsSetting from "discourse/plugins/discourse-adplugin/discourse/components/house-ads-setting";
 import { mapBy } from "@ember/object/computed";
+import HouseAdsSetting from "discourse/plugins/discourse-adplugin/discourse/components/house-ads-setting";
 
 export default HouseAdsSetting.extend({
   classNames: "house-ads-setting house-ads-list-setting",
diff --git a/assets/javascripts/discourse/controllers/admin-plugins-house-ads-show.js b/assets/javascripts/discourse/controllers/admin-plugins-house-ads-show.js
index 982a04fd..61ab5218 100644
--- a/assets/javascripts/discourse/controllers/admin-plugins-house-ads-show.js
+++ b/assets/javascripts/discourse/controllers/admin-plugins-house-ads-show.js
@@ -1,10 +1,10 @@
-import I18n from "I18n";
+import Controller, { inject as controller } from "@ember/controller";
+import { not, or } from "@ember/object/computed";
 import { ajax } from "discourse/lib/ajax";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 import { propertyNotEqual } from "discourse/lib/computed";
 import { bufferedProperty } from "discourse/mixins/buffered-content";
-import Controller, { inject as controller } from "@ember/controller";
-import { not, or } from "@ember/object/computed";
+import I18n from "I18n";
 
 export default Controller.extend(bufferedProperty("model"), {
   adminPluginsHouseAds: controller("adminPlugins.houseAds"),
diff --git a/assets/javascripts/discourse/routes/admin-plugins-house-ads-index.js b/assets/javascripts/discourse/routes/admin-plugins-house-ads-index.js
index d81cb12c..85e99ac5 100644
--- a/assets/javascripts/discourse/routes/admin-plugins-house-ads-index.js
+++ b/assets/javascripts/discourse/routes/admin-plugins-house-ads-index.js
@@ -1,5 +1,5 @@
-import DiscourseRoute from "discourse/routes/discourse";
 import { action } from "@ember/object";
+import DiscourseRoute from "discourse/routes/discourse";
 
 export default DiscourseRoute.extend({
   @action
diff --git a/assets/javascripts/discourse/routes/admin-plugins-house-ads-show.js b/assets/javascripts/discourse/routes/admin-plugins-house-ads-show.js
index a2dd4f54..61683172 100644
--- a/assets/javascripts/discourse/routes/admin-plugins-house-ads-show.js
+++ b/assets/javascripts/discourse/routes/admin-plugins-house-ads-show.js
@@ -1,5 +1,5 @@
-import DiscourseRoute from "discourse/routes/discourse";
 import EmberObject from "@ember/object";
+import DiscourseRoute from "discourse/routes/discourse";
 import I18n from "I18n";
 
 export default DiscourseRoute.extend({
diff --git a/assets/javascripts/discourse/routes/admin-plugins-house-ads.js b/assets/javascripts/discourse/routes/admin-plugins-house-ads.js
index 9bd5c0ac..4f2a38e6 100644
--- a/assets/javascripts/discourse/routes/admin-plugins-house-ads.js
+++ b/assets/javascripts/discourse/routes/admin-plugins-house-ads.js
@@ -1,6 +1,6 @@
+import EmberObject from "@ember/object";
 import { ajax } from "discourse/lib/ajax";
 import DiscourseRoute from "discourse/routes/discourse";
-import EmberObject from "@ember/object";
 
 export default DiscourseRoute.extend({
   settings: null,
diff --git a/test/javascripts/acceptance/adsense-test.js b/test/javascripts/acceptance/adsense-test.js
index 66e28305..e7679261 100644
--- a/test/javascripts/acceptance/adsense-test.js
+++ b/test/javascripts/acceptance/adsense-test.js
@@ -1,10 +1,10 @@
+import { find, visit } from "@ember/test-helpers";
+import { test } from "qunit";
+import groupFixtures from "discourse/tests/fixtures/group-fixtures";
 import {
   acceptance,
   updateCurrentUser,
 } from "discourse/tests/helpers/qunit-helpers";
-import { test } from "qunit";
-import groupFixtures from "discourse/tests/fixtures/group-fixtures";
-import { visit } from "@ember/test-helpers";
 
 acceptance("AdSense", function (needs) {
   needs.user();
diff --git a/test/javascripts/acceptance/dfp-test.js b/test/javascripts/acceptance/dfp-test.js
index a8096187..f6e96542 100644
--- a/test/javascripts/acceptance/dfp-test.js
+++ b/test/javascripts/acceptance/dfp-test.js
@@ -1,10 +1,10 @@
+import { find, visit } from "@ember/test-helpers";
+import { test } from "qunit";
+import groupFixtures from "discourse/tests/fixtures/group-fixtures";
 import {
   acceptance,
   updateCurrentUser,
 } from "discourse/tests/helpers/qunit-helpers";
-import { test } from "qunit";
-import groupFixtures from "discourse/tests/fixtures/group-fixtures";
-import { visit } from "@ember/test-helpers";
 
 acceptance("DFP Ads", function (needs) {
   needs.user();
diff --git a/test/javascripts/acceptance/house-ad-test.js b/test/javascripts/acceptance/house-ad-test.js
index fa929a3d..38895a6c 100644
--- a/test/javascripts/acceptance/house-ad-test.js
+++ b/test/javascripts/acceptance/house-ad-test.js
@@ -1,9 +1,9 @@
+import { find, visit } from "@ember/test-helpers";
+import { test } from "qunit";
 import {
   acceptance,
   updateCurrentUser,
 } from "discourse/tests/helpers/qunit-helpers";
-import { test } from "qunit";
-import { visit } from "@ember/test-helpers";
 
 acceptance("House Ads", function (needs) {
   needs.user();
diff --git a/test/javascripts/acceptance/mixed-ads-test.js b/test/javascripts/acceptance/mixed-ads-test.js
index 76e44221..4cd72409 100644
--- a/test/javascripts/acceptance/mixed-ads-test.js
+++ b/test/javascripts/acceptance/mixed-ads-test.js
@@ -1,9 +1,9 @@
+import { find, visit } from "@ember/test-helpers";
+import { test } from "qunit";
 import {
   acceptance,
   updateCurrentUser,
 } from "discourse/tests/helpers/qunit-helpers";
-import { test } from "qunit";
-import { visit } from "@ember/test-helpers";
 
 acceptance("Mixed Ads", function (needs) {
   needs.user();