diff --git a/app/assets/javascripts/admin/routes/admin-api-index.js.es6 b/app/assets/javascripts/admin/routes/admin-api-index.js.es6
index c66efab129d..f770f90c913 100644
--- a/app/assets/javascripts/admin/routes/admin-api-index.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-api-index.js.es6
@@ -1,4 +1,6 @@
-export default Ember.Route.extend({
+import Route from "@ember/routing/route";
+
+export default Route.extend({
   beforeModel() {
     this.transitionTo("adminApiKeys");
   }
diff --git a/app/assets/javascripts/admin/routes/admin-api-keys.js.es6 b/app/assets/javascripts/admin/routes/admin-api-keys.js.es6
index 4332cb0adc2..18262775674 100644
--- a/app/assets/javascripts/admin/routes/admin-api-keys.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-api-keys.js.es6
@@ -1,6 +1,7 @@
+import Route from "@ember/routing/route";
 import ApiKey from "admin/models/api-key";
 
-export default Ember.Route.extend({
+export default Route.extend({
   model() {
     return ApiKey.find();
   }
diff --git a/app/assets/javascripts/admin/routes/admin-backups-index.js.es6 b/app/assets/javascripts/admin/routes/admin-backups-index.js.es6
index 39ed982a787..d20da4ac50f 100644
--- a/app/assets/javascripts/admin/routes/admin-backups-index.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-backups-index.js.es6
@@ -1,6 +1,7 @@
+import Route from "@ember/routing/route";
 import Backup from "admin/models/backup";
 
-export default Ember.Route.extend({
+export default Route.extend({
   activate() {
     this.messageBus.subscribe("/admin/backups", backups =>
       this.controller.set("model", backups.map(backup => Backup.create(backup)))
diff --git a/app/assets/javascripts/admin/routes/admin-backups-logs.js.es6 b/app/assets/javascripts/admin/routes/admin-backups-logs.js.es6
index a0febc3d1de..58baa135871 100644
--- a/app/assets/javascripts/admin/routes/admin-backups-logs.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-backups-logs.js.es6
@@ -1,6 +1,7 @@
+import Route from "@ember/routing/route";
 import PreloadStore from "preload-store";
 
-export default Ember.Route.extend({
+export default Route.extend({
   // since the logs are pushed via the message bus
   // we only want to preload them (hence the beforeModel hook)
   beforeModel() {
diff --git a/app/assets/javascripts/admin/routes/admin-badges-index.js.es6 b/app/assets/javascripts/admin/routes/admin-badges-index.js.es6
index 84a5bee571b..36a44148777 100644
--- a/app/assets/javascripts/admin/routes/admin-badges-index.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-badges-index.js.es6
@@ -1,3 +1,4 @@
+import Route from "@ember/routing/route";
 import { emojiUrlFor } from "discourse/lib/text";
 
 const badgeIntroLinks = [
@@ -13,7 +14,7 @@ const badgeIntroLinks = [
   }
 ];
 
-export default Ember.Route.extend({
+export default Route.extend({
   setupController(controller) {
     controller.setProperties({
       badgeIntroLinks,
diff --git a/app/assets/javascripts/admin/routes/admin-badges-show.js.es6 b/app/assets/javascripts/admin/routes/admin-badges-show.js.es6
index 7837d1b30de..039231e8976 100644
--- a/app/assets/javascripts/admin/routes/admin-badges-show.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-badges-show.js.es6
@@ -1,8 +1,9 @@
+import Route from "@ember/routing/route";
 import { ajax } from "discourse/lib/ajax";
 import Badge from "discourse/models/badge";
 import showModal from "discourse/lib/show-modal";
 
-export default Ember.Route.extend({
+export default Route.extend({
   serialize(m) {
     return { badge_id: Ember.get(m, "id") || "new" };
   },
diff --git a/app/assets/javascripts/admin/routes/admin-customize-colors-show.js.es6 b/app/assets/javascripts/admin/routes/admin-customize-colors-show.js.es6
index 545a09ad9b2..146a3a61a9e 100644
--- a/app/assets/javascripts/admin/routes/admin-customize-colors-show.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-customize-colors-show.js.es6
@@ -1,4 +1,5 @@
-export default Ember.Route.extend({
+import Route from "@ember/routing/route";
+export default Route.extend({
   model(params) {
     const all = this.modelFor("adminCustomize.colors");
     const model = all.findBy("id", parseInt(params.scheme_id));
diff --git a/app/assets/javascripts/admin/routes/admin-customize-colors.js.es6 b/app/assets/javascripts/admin/routes/admin-customize-colors.js.es6
index f4853fda280..835814df077 100644
--- a/app/assets/javascripts/admin/routes/admin-customize-colors.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-customize-colors.js.es6
@@ -1,6 +1,7 @@
+import Route from "@ember/routing/route";
 import ColorScheme from "admin/models/color-scheme";
 
-export default Ember.Route.extend({
+export default Route.extend({
   model() {
     return ColorScheme.findAll();
   },
diff --git a/app/assets/javascripts/admin/routes/admin-customize-email-style-edit.js.es6 b/app/assets/javascripts/admin/routes/admin-customize-email-style-edit.js.es6
index 74649c1a004..8dcc18f0d91 100644
--- a/app/assets/javascripts/admin/routes/admin-customize-email-style-edit.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-customize-email-style-edit.js.es6
@@ -1,4 +1,5 @@
-export default Ember.Route.extend({
+import Route from "@ember/routing/route";
+export default Route.extend({
   model(params) {
     return {
       model: this.modelFor("adminCustomizeEmailStyle"),
diff --git a/app/assets/javascripts/admin/routes/admin-customize-email-style.js.es6 b/app/assets/javascripts/admin/routes/admin-customize-email-style.js.es6
index 8e202e62bd8..d63186e0eb0 100644
--- a/app/assets/javascripts/admin/routes/admin-customize-email-style.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-customize-email-style.js.es6
@@ -1,4 +1,5 @@
-export default Ember.Route.extend({
+import Route from "@ember/routing/route";
+export default Route.extend({
   model() {
     return this.store.find("email-style");
   },
diff --git a/app/assets/javascripts/admin/routes/admin-customize-email-templates-edit.js.es6 b/app/assets/javascripts/admin/routes/admin-customize-email-templates-edit.js.es6
index a6f170b09e8..0bf85baf4a1 100644
--- a/app/assets/javascripts/admin/routes/admin-customize-email-templates-edit.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-customize-email-templates-edit.js.es6
@@ -1,6 +1,7 @@
+import Route from "@ember/routing/route";
 import { scrollTop } from "discourse/mixins/scroll-top";
 
-export default Ember.Route.extend({
+export default Route.extend({
   model(params) {
     const all = this.modelFor("adminCustomizeEmailTemplates");
     return all.findBy("id", params.id);
diff --git a/app/assets/javascripts/admin/routes/admin-customize-email-templates.js.es6 b/app/assets/javascripts/admin/routes/admin-customize-email-templates.js.es6
index fa6d3041a61..39b04b835ff 100644
--- a/app/assets/javascripts/admin/routes/admin-customize-email-templates.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-customize-email-templates.js.es6
@@ -1,4 +1,5 @@
-export default Ember.Route.extend({
+import Route from "@ember/routing/route";
+export default Route.extend({
   model() {
     return this.store.findAll("email-template");
   },
diff --git a/app/assets/javascripts/admin/routes/admin-customize-index.js.es6 b/app/assets/javascripts/admin/routes/admin-customize-index.js.es6
index 10d55df015b..9c593b7e25f 100644
--- a/app/assets/javascripts/admin/routes/admin-customize-index.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-customize-index.js.es6
@@ -1,4 +1,5 @@
-export default Ember.Route.extend({
+import Route from "@ember/routing/route";
+export default Route.extend({
   beforeModel() {
     this.transitionTo("adminCustomizeThemes");
   }
diff --git a/app/assets/javascripts/admin/routes/admin-customize-robots-txt.js.es6 b/app/assets/javascripts/admin/routes/admin-customize-robots-txt.js.es6
index 50acd6cac1d..866d7cf8ecc 100644
--- a/app/assets/javascripts/admin/routes/admin-customize-robots-txt.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-customize-robots-txt.js.es6
@@ -1,6 +1,7 @@
+import Route from "@ember/routing/route";
 import { ajax } from "discourse/lib/ajax";
 
-export default Ember.Route.extend({
+export default Route.extend({
   model() {
     return ajax("/admin/customize/robots");
   }
diff --git a/app/assets/javascripts/admin/routes/admin-customize-themes-edit.js.es6 b/app/assets/javascripts/admin/routes/admin-customize-themes-edit.js.es6
index 2e37bdc1ced..335e9fd5786 100644
--- a/app/assets/javascripts/admin/routes/admin-customize-themes-edit.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-customize-themes-edit.js.es6
@@ -1,4 +1,5 @@
-export default Ember.Route.extend({
+import Route from "@ember/routing/route";
+export default Route.extend({
   model(params) {
     const all = this.modelFor("adminCustomizeThemes");
     const model = all.findBy("id", parseInt(params.theme_id));
diff --git a/app/assets/javascripts/admin/routes/admin-customize-themes-index.js.es6 b/app/assets/javascripts/admin/routes/admin-customize-themes-index.js.es6
index ea09122d628..425a04617a0 100644
--- a/app/assets/javascripts/admin/routes/admin-customize-themes-index.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-customize-themes-index.js.es6
@@ -1,3 +1,4 @@
+import Route from "@ember/routing/route";
 import { emojiUrlFor } from "discourse/lib/text";
 
 const externalResources = [
@@ -18,7 +19,7 @@ const externalResources = [
   }
 ];
 
-export default Ember.Route.extend({
+export default Route.extend({
   setupController(controller) {
     this._super(...arguments);
     this.controllerFor("adminCustomizeThemes").set("editingTheme", false);
diff --git a/app/assets/javascripts/admin/routes/admin-customize-themes-show.js.es6 b/app/assets/javascripts/admin/routes/admin-customize-themes-show.js.es6
index a0ca4feef8f..c9573fd8ac9 100644
--- a/app/assets/javascripts/admin/routes/admin-customize-themes-show.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-customize-themes-show.js.es6
@@ -1,7 +1,8 @@
+import Route from "@ember/routing/route";
 import { scrollTop } from "discourse/mixins/scroll-top";
 import { THEMES, COMPONENTS } from "admin/models/theme";
 
-export default Ember.Route.extend({
+export default Route.extend({
   serialize(model) {
     return { theme_id: model.get("id") };
   },
diff --git a/app/assets/javascripts/admin/routes/admin-customize-themes.js.es6 b/app/assets/javascripts/admin/routes/admin-customize-themes.js.es6
index 91c7ec5b760..7f7274ee0e2 100644
--- a/app/assets/javascripts/admin/routes/admin-customize-themes.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-customize-themes.js.es6
@@ -1,6 +1,7 @@
+import Route from "@ember/routing/route";
 import showModal from "discourse/lib/show-modal";
 
-export default Ember.Route.extend({
+export default Route.extend({
   model() {
     return this.store.findAll("theme");
   },
diff --git a/app/assets/javascripts/admin/routes/admin-embedding.js.es6 b/app/assets/javascripts/admin/routes/admin-embedding.js.es6
index d698c52450e..080dce20831 100644
--- a/app/assets/javascripts/admin/routes/admin-embedding.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-embedding.js.es6
@@ -1,4 +1,5 @@
-export default Ember.Route.extend({
+import Route from "@ember/routing/route";
+export default Route.extend({
   model() {
     return this.store.find("embedding");
   },
diff --git a/app/assets/javascripts/admin/routes/admin-plugins.js.es6 b/app/assets/javascripts/admin/routes/admin-plugins.js.es6
index 06ea7eb259e..c4af286fafb 100644
--- a/app/assets/javascripts/admin/routes/admin-plugins.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-plugins.js.es6
@@ -1,4 +1,5 @@
-export default Ember.Route.extend({
+import Route from "@ember/routing/route";
+export default Route.extend({
   model() {
     return this.store.findAll("plugin");
   },
diff --git a/app/assets/javascripts/admin/routes/admin-site-text-edit.js.es6 b/app/assets/javascripts/admin/routes/admin-site-text-edit.js.es6
index 00ccca02564..c423eae45ab 100644
--- a/app/assets/javascripts/admin/routes/admin-site-text-edit.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-site-text-edit.js.es6
@@ -1,4 +1,5 @@
-export default Ember.Route.extend({
+import Route from "@ember/routing/route";
+export default Route.extend({
   model(params) {
     return this.store.find("site-text", params.id);
   },
diff --git a/app/assets/javascripts/admin/routes/admin-site-text-index.js.es6 b/app/assets/javascripts/admin/routes/admin-site-text-index.js.es6
index dfec2f64d38..2c0e365322e 100644
--- a/app/assets/javascripts/admin/routes/admin-site-text-index.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-site-text-index.js.es6
@@ -1,6 +1,7 @@
+import Route from "@ember/routing/route";
 import showModal from "discourse/lib/show-modal";
 
-export default Ember.Route.extend({
+export default Route.extend({
   queryParams: {
     q: { replace: true },
     overridden: { replace: true }
diff --git a/app/assets/javascripts/admin/routes/admin-web-hooks.js.es6 b/app/assets/javascripts/admin/routes/admin-web-hooks.js.es6
index eed884a8ab7..30daf6b6cbb 100644
--- a/app/assets/javascripts/admin/routes/admin-web-hooks.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-web-hooks.js.es6
@@ -1,4 +1,5 @@
-export default Ember.Route.extend({
+import Route from "@ember/routing/route";
+export default Route.extend({
   model() {
     return this.store.findAll("web-hook");
   },
diff --git a/app/assets/javascripts/discourse/routes/account-created-edit-email.js.es6 b/app/assets/javascripts/discourse/routes/account-created-edit-email.js.es6
index 0922f7fe098..0946fe05db1 100644
--- a/app/assets/javascripts/discourse/routes/account-created-edit-email.js.es6
+++ b/app/assets/javascripts/discourse/routes/account-created-edit-email.js.es6
@@ -1,4 +1,5 @@
-export default Ember.Route.extend({
+import Route from "@ember/routing/route";
+export default Route.extend({
   setupController(controller) {
     const accountCreated = this.controllerFor("account-created").get(
       "accountCreated"
diff --git a/app/assets/javascripts/discourse/routes/account-created-index.js.es6 b/app/assets/javascripts/discourse/routes/account-created-index.js.es6
index 33aa658049a..d3f46333a68 100644
--- a/app/assets/javascripts/discourse/routes/account-created-index.js.es6
+++ b/app/assets/javascripts/discourse/routes/account-created-index.js.es6
@@ -1,4 +1,5 @@
-export default Ember.Route.extend({
+import Route from "@ember/routing/route";
+export default Route.extend({
   setupController(controller) {
     controller.set(
       "accountCreated",
diff --git a/app/assets/javascripts/discourse/routes/account-created-resent.js.es6 b/app/assets/javascripts/discourse/routes/account-created-resent.js.es6
index deb2af19703..047906d262f 100644
--- a/app/assets/javascripts/discourse/routes/account-created-resent.js.es6
+++ b/app/assets/javascripts/discourse/routes/account-created-resent.js.es6
@@ -1,4 +1,5 @@
-export default Ember.Route.extend({
+import Route from "@ember/routing/route";
+export default Route.extend({
   setupController(controller) {
     controller.set(
       "email",
diff --git a/app/assets/javascripts/discourse/routes/account-created.js.es6 b/app/assets/javascripts/discourse/routes/account-created.js.es6
index ab117f59887..901f6c0ffb7 100644
--- a/app/assets/javascripts/discourse/routes/account-created.js.es6
+++ b/app/assets/javascripts/discourse/routes/account-created.js.es6
@@ -1,6 +1,7 @@
+import Route from "@ember/routing/route";
 import PreloadStore from "preload-store";
 
-export default Ember.Route.extend({
+export default Route.extend({
   setupController(controller) {
     controller.set("accountCreated", PreloadStore.get("accountCreated"));
   }
diff --git a/app/assets/javascripts/discourse/routes/group-messages-index.js.es6 b/app/assets/javascripts/discourse/routes/group-messages-index.js.es6
index 68750d154a0..be802450b23 100644
--- a/app/assets/javascripts/discourse/routes/group-messages-index.js.es6
+++ b/app/assets/javascripts/discourse/routes/group-messages-index.js.es6
@@ -1,4 +1,5 @@
-export default Ember.Route.extend({
+import Route from "@ember/routing/route";
+export default Route.extend({
   beforeModel: function() {
     this.transitionTo("group.messages.inbox");
   }
diff --git a/app/assets/javascripts/wizard/routes/application.js.es6 b/app/assets/javascripts/wizard/routes/application.js.es6
index d460cdcc9af..6ac24a8efde 100644
--- a/app/assets/javascripts/wizard/routes/application.js.es6
+++ b/app/assets/javascripts/wizard/routes/application.js.es6
@@ -1,6 +1,7 @@
+import Route from "@ember/routing/route";
 import { findWizard } from "wizard/models/wizard";
 
-export default Ember.Route.extend({
+export default Route.extend({
   model() {
     return findWizard();
   },
diff --git a/app/assets/javascripts/wizard/routes/index.js.es6 b/app/assets/javascripts/wizard/routes/index.js.es6
index 9c82ae52462..5d8ab072eac 100644
--- a/app/assets/javascripts/wizard/routes/index.js.es6
+++ b/app/assets/javascripts/wizard/routes/index.js.es6
@@ -1,4 +1,5 @@
-export default Ember.Route.extend({
+import Route from "@ember/routing/route";
+export default Route.extend({
   beforeModel() {
     const appModel = this.modelFor("application");
     this.replaceWith("step", appModel.start);
diff --git a/app/assets/javascripts/wizard/routes/step.js.es6 b/app/assets/javascripts/wizard/routes/step.js.es6
index 4bafdfc115e..21b68530441 100644
--- a/app/assets/javascripts/wizard/routes/step.js.es6
+++ b/app/assets/javascripts/wizard/routes/step.js.es6
@@ -1,4 +1,5 @@
-export default Ember.Route.extend({
+import Route from "@ember/routing/route";
+export default Route.extend({
   model(params) {
     const allSteps = this.modelFor("application").steps;
     const step = allSteps.findBy("id", params.step_id);