DEV: Fix imports (#111)

assets/javascripts/admin/components/channel-data.js

@@ -1,3 +1,5 @@
-export default Ember.Component.extend({
+import Component from "@ember/component";
+
+export default Component.extend({
   classNames: ["channel-info"],
 });

assets/javascripts/admin/components/channel-details.js

@@ -1,7 +1,9 @@
+import Component from "@ember/component";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 import I18n from "I18n";
+import bootbox from "bootbox";
 
-export default Ember.Component.extend({
+export default Component.extend({
   classNames: ["channel-details"],
 
   actions: {

assets/javascripts/admin/components/rule-row.js

@@ -1,7 +1,8 @@
+import Component from "@ember/component";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 import computed from "discourse-common/utils/decorators";
 
-export default Ember.Component.extend({
+export default Component.extend({
   tagName: "tr",
 
   @computed("rule.type")

assets/javascripts/admin/controllers/admin-plugins-chat-integration-provider.js

@@ -1,7 +1,8 @@
+import Controller from "@ember/controller";
 import showModal from "discourse/lib/show-modal";
 import computed from "discourse-common/utils/decorators";
 
-export default Ember.Controller.extend({
+export default Controller.extend({
   modalShowing: false,
 
   @computed("model.channels")

assets/javascripts/admin/controllers/admin-plugins-chat-integration.js

@@ -1 +1,3 @@
-export default Ember.Controller.extend({});
+import Controller from "@ember/controller";
+
+export default Controller.extend({});

assets/javascripts/admin/controllers/modals/admin-plugins-chat-integration-edit-channel.js

@@ -1,13 +1,18 @@
+import Controller from "@ember/controller";
 import I18n from "I18n";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 import { popupAjaxError } from "discourse/lib/ajax-error";
-import EmberObject from "@ember/object";
+import EmberObject, {
+  defineProperty,
+  computed as emberComputed,
+} from "@ember/object";
 import computed, { observes, on } from "discourse-common/utils/decorators";
+import { schedule } from "@ember/runloop";
 
-export default Ember.Controller.extend(ModalFunctionality, {
+export default Controller.extend(ModalFunctionality, {
   @on("init")
   setupKeydown() {
-    Ember.run.schedule("afterRender", () => {
+    schedule("afterRender", () => {
       $("#chat-integration-edit-channel-modal").keydown((e) => {
         if (e.keyCode === 13) {
           this.send("save");
@@ -23,10 +28,10 @@ export default Ember.Controller.extend(ModalFunctionality, {
       const theKeys = this.get("model.provider.channel_parameters").map(
         (param) => param["key"]
       );
-      Ember.defineProperty(
+      defineProperty(
         this,
         "paramValidation",
-        Ember.computed(
+        emberComputed(
           `model.channel.data.{${theKeys.join(",")}}`,
           this._paramValidation
         )

assets/javascripts/admin/controllers/modals/admin-plugins-chat-integration-edit-rule.js

@@ -1,13 +1,15 @@
+import Controller from "@ember/controller";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 import computed, { on } from "discourse-common/utils/decorators";
+import { schedule } from "@ember/runloop";
 
-export default Ember.Controller.extend(ModalFunctionality, {
+export default Controller.extend(ModalFunctionality, {
   saveDisabled: false,
 
   @on("init")
   setupKeydown() {
-    Ember.run.schedule("afterRender", () => {
+    schedule("afterRender", () => {
       $("#chat-integration-edit-channel-modal").keydown((e) => {
         if (e.keyCode === 13) {
           this.send("save");

assets/javascripts/admin/controllers/modals/admin-plugins-chat-integration-test.js

@@ -1,13 +1,15 @@
+import Controller from "@ember/controller";
 import I18n from "I18n";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 import { ajax } from "discourse/lib/ajax";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 import computed, { on } from "discourse-common/utils/decorators";
+import { schedule } from "@ember/runloop";
 
-export default Ember.Controller.extend(ModalFunctionality, {
+export default Controller.extend(ModalFunctionality, {
   @on("init")
   setupKeydown() {
-    Ember.run.schedule("afterRender", () => {
+    schedule("afterRender", () => {
       $("#chat_integration_test_modal").keydown((e) => {
         if (e.keyCode === 13) {
           this.send("send");

assets/javascripts/admin/routes/admin-plugins-chat-integration-provider.js

@@ -1,10 +1,11 @@
 import DiscourseRoute from "discourse/routes/discourse";
 import Group from "discourse/models/group";
 import { action } from "@ember/object";
+import RSVP from "rsvp";
 
 export default DiscourseRoute.extend({
   model(params) {
-    return Ember.RSVP.hash({
+    return RSVP.hash({
       channels: this.store.findAll("channel", { provider: params.provider }),
       provider: this.modelFor("admin-plugins-chat-integration").findBy(
         "id",

assets/javascripts/discourse/routes/transcript.js

@@ -1,6 +1,7 @@
 import { ajax } from "discourse/lib/ajax";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 import DiscourseRoute from "discourse/routes/discourse";
+import { next } from "@ember/runloop";
 
 export default DiscourseRoute.extend({
   model(params) {
@@ -9,7 +10,7 @@ export default DiscourseRoute.extend({
 
       this.replaceWith("discovery.latest").then((e) => {
         if (this.controllerFor("navigation/default").get("canCreateTopic")) {
-          Ember.run.next(() => {
+          next(() => {
             ajax(`chat-transcript/${secret}`).then((result) => {
               e.send(
                 "createNewTopicViaParams",

package.json

@@ -5,6 +5,6 @@
   "author": "Discourse",
   "license": "MIT",
   "devDependencies": {
-    "eslint-config-discourse": "^1.1.4"
+    "eslint-config-discourse": "^2.0.0"
   }
 }

yarn.lock

@@ -498,10 +498,10 @@ escape-string-regexp@^1.0.5:
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
   integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=
 
-eslint-config-discourse@^1.1.4:
+eslint-config-discourse@^2.0.0:
-  version "1.1.4"
+  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/eslint-config-discourse/-/eslint-config-discourse-1.1.4.tgz#cff9f93f17dfcefe4852bb417f747c28444b4bd7"
+  resolved "https://registry.yarnpkg.com/eslint-config-discourse/-/eslint-config-discourse-2.0.0.tgz#811ab2cf4e32c1f0d41bd57d9736d578fe80b741"
-  integrity sha512-4Yilkkmdkz/LdEiQCbng6evI2w33HDs9lXgiae0DutjTboqs/TauQXySusxHagKr9GFtefPOxovzNKwD2s1ggw==
+  integrity sha512-enjsLU++iibJXM64YM6Y/yUM5580wKtkti9fQdrJDFkfLJnvv8/f2j7QmNbX//MoqWfIQfY2RkHH6VTfRUg4Mw==
   dependencies:
     babel-eslint "^10.1.0"
     ember-template-lint "^2.11.0"
@@ -511,7 +511,7 @@ eslint-config-discourse@^1.1.4:
     eslint-plugin-ember "^6.10.0"
     eslint-plugin-lodash "^7.1.0"
     eslint-plugin-node "^8.0.0"
-    prettier "^2.1.1"
+    prettier "2.2.1"
 
 eslint-plugin-discourse-ember@latest:
   version "0.0.3"
@@ -1204,10 +1204,10 @@ prelude-ls@~1.1.2:
   resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"
   integrity sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=
 
-prettier@^2.1.1:
+prettier@2.2.1:
-  version "2.1.2"
+  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.1.2.tgz#3050700dae2e4c8b67c4c3f666cdb8af405e1ce5"
+  resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.2.1.tgz#795a1a78dd52f073da0cd42b21f9c91381923ff5"
-  integrity sha512-16c7K+x4qVlJg9rEbXl7HEGmQyZlG4R9AgP+oHKRMsMsuk8s+ATStlf1NpDqyBI1HpVyfjLOeMhH2LvuNvV5Vg==
+  integrity sha512-PqyhM2yCjg/oKkFPtTGUojv7gnZAoG80ttl45O6x2Ug/rMJw4wcc9k6aaf2hibP7BGVCCM33gZoGjyvt9mm16Q==
 
 progress@^2.0.0:
   version "2.0.3"