From e5311ab645f42e226cf30efd1c738c1fa4ce506f Mon Sep 17 00:00:00 2001
From: Mark VanLandingham <markvanlan@gmail.com>
Date: Tue, 22 Oct 2019 08:46:10 -0500
Subject: [PATCH] DEV: Import DiscourseRoute rather than Discourse.Route
 (#8225)

* DEV: Discourse.Route -> DiscourseRoute with import

* ran prettier on all routes

* prettiered one more file
---
 app/assets/javascripts/admin/routes/admin-backups.js.es6      | 3 ++-
 app/assets/javascripts/admin/routes/admin-badges.js.es6       | 3 ++-
 .../javascripts/admin/routes/admin-dashboard-general.js.es6   | 4 +++-
 .../javascripts/admin/routes/admin-dashboard-reports.js.es6   | 3 ++-
 app/assets/javascripts/admin/routes/admin-dashboard.js.es6    | 3 ++-
 .../javascripts/admin/routes/admin-email-incomings.js.es6     | 3 ++-
 app/assets/javascripts/admin/routes/admin-email-index.js.es6  | 3 ++-
 app/assets/javascripts/admin/routes/admin-email-logs.js.es6   | 4 +++-
 .../admin/routes/admin-email-preview-digest.js.es6            | 3 ++-
 app/assets/javascripts/admin/routes/admin-emojis.js.es6       | 4 +++-
 .../javascripts/admin/routes/admin-flags-posts-active.js.es6  | 4 +++-
 .../javascripts/admin/routes/admin-flags-posts-old.js.es6     | 4 +++-
 .../javascripts/admin/routes/admin-flags-topics-index.js.es6  | 4 +++-
 app/assets/javascripts/admin/routes/admin-logs-index.js.es6   | 4 +++-
 .../admin/routes/admin-logs-screened-emails.js.es6            | 4 +++-
 .../admin/routes/admin-logs-screened-ip-addresses.js.es6      | 4 +++-
 .../javascripts/admin/routes/admin-logs-screened-urls.js.es6  | 4 +++-
 .../admin/routes/admin-logs-staff-action-logs.js.es6          | 3 ++-
 app/assets/javascripts/admin/routes/admin-permalinks.js.es6   | 3 ++-
 .../javascripts/admin/routes/admin-reports-index.js.es6       | 4 +++-
 app/assets/javascripts/admin/routes/admin-reports-show.js.es6 | 4 +++-
 .../javascripts/admin/routes/admin-search-logs-index.js.es6   | 3 ++-
 .../javascripts/admin/routes/admin-search-logs-term.js.es6    | 3 ++-
 .../admin/routes/admin-site-settings-category.js.es6          | 4 +++-
 .../javascripts/admin/routes/admin-site-settings-index.js.es6 | 4 +++-
 .../javascripts/admin/routes/admin-site-settings.js.es6       | 3 ++-
 app/assets/javascripts/admin/routes/admin-user-badges.js.es6  | 3 ++-
 app/assets/javascripts/admin/routes/admin-user-fields.js.es6  | 3 ++-
 app/assets/javascripts/admin/routes/admin-user-index.js.es6   | 3 ++-
 .../admin/routes/admin-user-tl3-requirements.js.es6           | 4 +++-
 app/assets/javascripts/admin/routes/admin-user.js.es6         | 3 ++-
 app/assets/javascripts/admin/routes/admin-users-index.js.es6  | 4 +++-
 .../javascripts/admin/routes/admin-users-list-index.js.es6    | 4 +++-
 .../javascripts/admin/routes/admin-users-list-show.js.es6     | 4 +++-
 app/assets/javascripts/admin/routes/admin-users-list.js.es6   | 3 ++-
 .../admin/routes/admin-watched-words-action.js.es6            | 4 +++-
 .../javascripts/admin/routes/admin-watched-words-index.js.es6 | 4 +++-
 .../javascripts/admin/routes/admin-watched-words.js.es6       | 3 ++-
 .../admin/routes/admin-web-hooks-show-events.js.es6           | 4 +++-
 .../javascripts/admin/routes/admin-web-hooks-show.js.es6      | 4 +++-
 app/assets/javascripts/admin/routes/admin.js.es6              | 4 +++-
 .../javascripts/discourse/lib/static-route-builder.js.es6     | 3 ++-
 app/assets/javascripts/discourse/routes/about.js.es6          | 4 +++-
 app/assets/javascripts/discourse/routes/application.js.es6    | 3 ++-
 .../javascripts/discourse/routes/associate-account.js.es6     | 3 ++-
 app/assets/javascripts/discourse/routes/badges-index.js.es6   | 3 ++-
 app/assets/javascripts/discourse/routes/badges-show.js.es6    | 3 ++-
 .../discourse/routes/build-admin-user-posts-route.js.es6      | 3 ++-
 .../javascripts/discourse/routes/build-category-route.js.es6  | 3 ++-
 .../javascripts/discourse/routes/build-topic-route.js.es6     | 3 ++-
 .../javascripts/discourse/routes/discovery-categories.js.es6  | 3 ++-
 app/assets/javascripts/discourse/routes/discovery.js.es6      | 3 ++-
 app/assets/javascripts/discourse/routes/email-login.js.es6    | 3 ++-
 app/assets/javascripts/discourse/routes/exception.js.es6      | 4 +++-
 .../javascripts/discourse/routes/full-page-search.js.es6      | 3 ++-
 .../javascripts/discourse/routes/group-activity-posts.js.es6  | 4 +++-
 .../javascripts/discourse/routes/group-activity-topics.js.es6 | 4 +++-
 app/assets/javascripts/discourse/routes/group-index.js.es6    | 3 ++-
 .../javascripts/discourse/routes/group-manage-index.js.es6    | 4 +++-
 .../discourse/routes/group-manage-interaction.js.es6          | 4 +++-
 .../javascripts/discourse/routes/group-manage-logs.js.es6     | 4 +++-
 .../discourse/routes/group-manage-membership.js.es6           | 4 +++-
 .../javascripts/discourse/routes/group-manage-profile.js.es6  | 4 +++-
 app/assets/javascripts/discourse/routes/group-manage.js.es6   | 4 +++-
 app/assets/javascripts/discourse/routes/group-members.js.es6  | 4 +++-
 app/assets/javascripts/discourse/routes/group-messages.js.es6 | 4 +++-
 app/assets/javascripts/discourse/routes/group-requests.js.es6 | 4 +++-
 app/assets/javascripts/discourse/routes/group.js.es6          | 4 +++-
 app/assets/javascripts/discourse/routes/groups-index.js.es6   | 4 +++-
 app/assets/javascripts/discourse/routes/groups-new.js.es6     | 3 ++-
 app/assets/javascripts/discourse/routes/invites-show.js.es6   | 3 ++-
 app/assets/javascripts/discourse/routes/new-message.js.es6    | 3 ++-
 app/assets/javascripts/discourse/routes/new-topic.js.es6      | 3 ++-
 app/assets/javascripts/discourse/routes/password-reset.js.es6 | 3 ++-
 app/assets/javascripts/discourse/routes/post.js.es6           | 3 ++-
 app/assets/javascripts/discourse/routes/review-index.js.es6   | 4 +++-
 .../javascripts/discourse/routes/review-settings.js.es6       | 4 +++-
 app/assets/javascripts/discourse/routes/review-show.js.es6    | 4 +++-
 app/assets/javascripts/discourse/routes/review-topics.js.es6  | 4 +++-
 app/assets/javascripts/discourse/routes/review.js.es6         | 4 +++-
 .../javascripts/discourse/routes/tag-groups-show.js.es6       | 4 +++-
 app/assets/javascripts/discourse/routes/tag-groups.js.es6     | 4 +++-
 app/assets/javascripts/discourse/routes/tags-index.js.es6     | 3 ++-
 app/assets/javascripts/discourse/routes/tags-show.js.es6      | 3 ++-
 .../javascripts/discourse/routes/topic-by-slug-or-id.js.es6   | 3 ++-
 .../javascripts/discourse/routes/topic-from-params.js.es6     | 3 ++-
 app/assets/javascripts/discourse/routes/topic.js.es6          | 3 ++-
 app/assets/javascripts/discourse/routes/unknown.js.es6        | 3 ++-
 .../javascripts/discourse/routes/user-activity-drafts.js.es6  | 4 +++-
 .../javascripts/discourse/routes/user-activity-stream.js.es6  | 3 ++-
 app/assets/javascripts/discourse/routes/user-activity.js.es6  | 4 +++-
 app/assets/javascripts/discourse/routes/user-badges.js.es6    | 3 ++-
 app/assets/javascripts/discourse/routes/user-index.js.es6     | 4 +++-
 .../javascripts/discourse/routes/user-invited-index.js.es6    | 4 +++-
 .../javascripts/discourse/routes/user-invited-show.js.es6     | 3 ++-
 .../discourse/routes/user-notifications-index.js.es6          | 4 +++-
 .../javascripts/discourse/routes/user-notifications.js.es6    | 3 ++-
 .../discourse/routes/user-private-messages-tags.js.es6        | 3 ++-
 .../javascripts/discourse/routes/user-private-messages.js.es6 | 3 ++-
 app/assets/javascripts/discourse/routes/user-summary.js.es6   | 4 +++-
 .../javascripts/discourse/routes/user-topic-list.js.es6       | 3 ++-
 app/assets/javascripts/discourse/routes/user.js.es6           | 4 +++-
 app/assets/javascripts/discourse/routes/users.js.es6          | 4 +++-
 .../javascripts/discourse/routes/route-index.js.es6.erb       | 4 +++-
 .../assets/javascripts/discourse/routes/route-show.js.es6.erb | 4 +++-
 .../assets/javascripts/discourse/routes/route.js.es6.erb      | 4 +++-
 106 files changed, 268 insertions(+), 106 deletions(-)

diff --git a/app/assets/javascripts/admin/routes/admin-backups.js.es6 b/app/assets/javascripts/admin/routes/admin-backups.js.es6
index b70c9782868..44585e5d461 100644
--- a/app/assets/javascripts/admin/routes/admin-backups.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-backups.js.es6
@@ -1,3 +1,4 @@
+import DiscourseRoute from "discourse/routes/discourse";
 import { ajax } from "discourse/lib/ajax";
 import showModal from "discourse/lib/show-modal";
 import BackupStatus from "admin/models/backup-status";
@@ -6,7 +7,7 @@ import PreloadStore from "preload-store";
 
 const LOG_CHANNEL = "/admin/backups/logs";
 
-export default Discourse.Route.extend({
+export default DiscourseRoute.extend({
   activate() {
     this.messageBus.subscribe(LOG_CHANNEL, log => {
       if (log.message === "[STARTED]") {
diff --git a/app/assets/javascripts/admin/routes/admin-badges.js.es6 b/app/assets/javascripts/admin/routes/admin-badges.js.es6
index 9fee47fb4e4..0dac4bbaa21 100644
--- a/app/assets/javascripts/admin/routes/admin-badges.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-badges.js.es6
@@ -1,8 +1,9 @@
+import DiscourseRoute from "discourse/routes/discourse";
 import { ajax } from "discourse/lib/ajax";
 import Badge from "discourse/models/badge";
 import BadgeGrouping from "discourse/models/badge-grouping";
 
-export default Discourse.Route.extend({
+export default DiscourseRoute.extend({
   _json: null,
 
   model() {
diff --git a/app/assets/javascripts/admin/routes/admin-dashboard-general.js.es6 b/app/assets/javascripts/admin/routes/admin-dashboard-general.js.es6
index ffd544b3dba..1ee1b22121d 100644
--- a/app/assets/javascripts/admin/routes/admin-dashboard-general.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-dashboard-general.js.es6
@@ -1,4 +1,6 @@
-export default Discourse.Route.extend({
+import DiscourseRoute from "discourse/routes/discourse";
+
+export default DiscourseRoute.extend({
   activate() {
     this.controllerFor("admin-dashboard-general").fetchDashboard();
   }
diff --git a/app/assets/javascripts/admin/routes/admin-dashboard-reports.js.es6 b/app/assets/javascripts/admin/routes/admin-dashboard-reports.js.es6
index 7aea9010965..0de5bfe5057 100644
--- a/app/assets/javascripts/admin/routes/admin-dashboard-reports.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-dashboard-reports.js.es6
@@ -1,6 +1,7 @@
+import DiscourseRoute from "discourse/routes/discourse";
 import { ajax } from "discourse/lib/ajax";
 
-export default Discourse.Route.extend({
+export default DiscourseRoute.extend({
   model() {
     return ajax("/admin/reports").then(json => json);
   },
diff --git a/app/assets/javascripts/admin/routes/admin-dashboard.js.es6 b/app/assets/javascripts/admin/routes/admin-dashboard.js.es6
index a6ff3c215ee..905a148bc74 100644
--- a/app/assets/javascripts/admin/routes/admin-dashboard.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-dashboard.js.es6
@@ -1,6 +1,7 @@
+import DiscourseRoute from "discourse/routes/discourse";
 import { scrollTop } from "discourse/mixins/scroll-top";
 
-export default Discourse.Route.extend({
+export default DiscourseRoute.extend({
   activate() {
     this.controllerFor("admin-dashboard").fetchProblems();
     this.controllerFor("admin-dashboard").fetchDashboard();
diff --git a/app/assets/javascripts/admin/routes/admin-email-incomings.js.es6 b/app/assets/javascripts/admin/routes/admin-email-incomings.js.es6
index 79331282bbb..aa86f7f31d6 100644
--- a/app/assets/javascripts/admin/routes/admin-email-incomings.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-email-incomings.js.es6
@@ -1,6 +1,7 @@
+import DiscourseRoute from "discourse/routes/discourse";
 import IncomingEmail from "admin/models/incoming-email";
 
-export default Discourse.Route.extend({
+export default DiscourseRoute.extend({
   model() {
     return IncomingEmail.findAll({ status: this.status });
   },
diff --git a/app/assets/javascripts/admin/routes/admin-email-index.js.es6 b/app/assets/javascripts/admin/routes/admin-email-index.js.es6
index ca912cc009e..878885f9836 100644
--- a/app/assets/javascripts/admin/routes/admin-email-index.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-email-index.js.es6
@@ -1,6 +1,7 @@
+import DiscourseRoute from "discourse/routes/discourse";
 import EmailSettings from "admin/models/email-settings";
 
-export default Discourse.Route.extend({
+export default DiscourseRoute.extend({
   model() {
     return EmailSettings.find();
   }
diff --git a/app/assets/javascripts/admin/routes/admin-email-logs.js.es6 b/app/assets/javascripts/admin/routes/admin-email-logs.js.es6
index 7813fb93fde..8ebfebd1996 100644
--- a/app/assets/javascripts/admin/routes/admin-email-logs.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-email-logs.js.es6
@@ -1,4 +1,6 @@
-export default Discourse.Route.extend({
+import DiscourseRoute from "discourse/routes/discourse";
+
+export default DiscourseRoute.extend({
   setupController(controller) {
     controller.setProperties({
       loading: true,
diff --git a/app/assets/javascripts/admin/routes/admin-email-preview-digest.js.es6 b/app/assets/javascripts/admin/routes/admin-email-preview-digest.js.es6
index 972f3c9b6dc..391ec6c75bc 100644
--- a/app/assets/javascripts/admin/routes/admin-email-preview-digest.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-email-preview-digest.js.es6
@@ -1,9 +1,10 @@
+import DiscourseRoute from "discourse/routes/discourse";
 import {
   default as EmailPreview,
   oneWeekAgo
 } from "admin/models/email-preview";
 
-export default Discourse.Route.extend({
+export default DiscourseRoute.extend({
   model() {
     return EmailPreview.findDigest(this.currentUser.get("username"));
   },
diff --git a/app/assets/javascripts/admin/routes/admin-emojis.js.es6 b/app/assets/javascripts/admin/routes/admin-emojis.js.es6
index f412a908989..4a001195fcd 100644
--- a/app/assets/javascripts/admin/routes/admin-emojis.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-emojis.js.es6
@@ -1,5 +1,7 @@
+import DiscourseRoute from "discourse/routes/discourse";
 import { ajax } from "discourse/lib/ajax";
-export default Discourse.Route.extend({
+
+export default DiscourseRoute.extend({
   model: function() {
     return ajax("/admin/customize/emojis.json").then(function(emojis) {
       return emojis.map(function(emoji) {
diff --git a/app/assets/javascripts/admin/routes/admin-flags-posts-active.js.es6 b/app/assets/javascripts/admin/routes/admin-flags-posts-active.js.es6
index d9719395035..1a1d01a0911 100644
--- a/app/assets/javascripts/admin/routes/admin-flags-posts-active.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-flags-posts-active.js.es6
@@ -1,4 +1,6 @@
-export default Discourse.Route.extend({
+import DiscourseRoute from "discourse/routes/discourse";
+
+export default DiscourseRoute.extend({
   model() {
     return this.store.findAll("flagged-post", { filter: "active" });
   }
diff --git a/app/assets/javascripts/admin/routes/admin-flags-posts-old.js.es6 b/app/assets/javascripts/admin/routes/admin-flags-posts-old.js.es6
index c7d22ccdadd..a4157d57146 100644
--- a/app/assets/javascripts/admin/routes/admin-flags-posts-old.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-flags-posts-old.js.es6
@@ -1,4 +1,6 @@
-export default Discourse.Route.extend({
+import DiscourseRoute from "discourse/routes/discourse";
+
+export default DiscourseRoute.extend({
   model() {
     return this.store.findAll("flagged-post", { filter: "old" });
   }
diff --git a/app/assets/javascripts/admin/routes/admin-flags-topics-index.js.es6 b/app/assets/javascripts/admin/routes/admin-flags-topics-index.js.es6
index d635328c050..5fb295d6480 100644
--- a/app/assets/javascripts/admin/routes/admin-flags-topics-index.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-flags-topics-index.js.es6
@@ -1,4 +1,6 @@
-export default Discourse.Route.extend({
+import DiscourseRoute from "discourse/routes/discourse";
+
+export default DiscourseRoute.extend({
   model() {
     return this.store.findAll("flagged-topic");
   },
diff --git a/app/assets/javascripts/admin/routes/admin-logs-index.js.es6 b/app/assets/javascripts/admin/routes/admin-logs-index.js.es6
index ff4c94aada9..d003b429b68 100644
--- a/app/assets/javascripts/admin/routes/admin-logs-index.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-logs-index.js.es6
@@ -1,4 +1,6 @@
-export default Discourse.Route.extend({
+import DiscourseRoute from "discourse/routes/discourse";
+
+export default DiscourseRoute.extend({
   redirect: function() {
     this.transitionTo("adminLogs.staffActionLogs");
   }
diff --git a/app/assets/javascripts/admin/routes/admin-logs-screened-emails.js.es6 b/app/assets/javascripts/admin/routes/admin-logs-screened-emails.js.es6
index f4f3a4f673b..2016a961889 100644
--- a/app/assets/javascripts/admin/routes/admin-logs-screened-emails.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-logs-screened-emails.js.es6
@@ -1,4 +1,6 @@
-export default Discourse.Route.extend({
+import DiscourseRoute from "discourse/routes/discourse";
+
+export default DiscourseRoute.extend({
   renderTemplate: function() {
     this.render("admin/templates/logs/screened-emails", { into: "adminLogs" });
   },
diff --git a/app/assets/javascripts/admin/routes/admin-logs-screened-ip-addresses.js.es6 b/app/assets/javascripts/admin/routes/admin-logs-screened-ip-addresses.js.es6
index 24000436b73..4343785594c 100644
--- a/app/assets/javascripts/admin/routes/admin-logs-screened-ip-addresses.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-logs-screened-ip-addresses.js.es6
@@ -1,4 +1,6 @@
-export default Discourse.Route.extend({
+import DiscourseRoute from "discourse/routes/discourse";
+
+export default DiscourseRoute.extend({
   renderTemplate() {
     this.render("admin/templates/logs/screened-ip-addresses", {
       into: "adminLogs"
diff --git a/app/assets/javascripts/admin/routes/admin-logs-screened-urls.js.es6 b/app/assets/javascripts/admin/routes/admin-logs-screened-urls.js.es6
index 2369a886cda..ba0b76c9c5b 100644
--- a/app/assets/javascripts/admin/routes/admin-logs-screened-urls.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-logs-screened-urls.js.es6
@@ -1,4 +1,6 @@
-export default Discourse.Route.extend({
+import DiscourseRoute from "discourse/routes/discourse";
+
+export default DiscourseRoute.extend({
   renderTemplate: function() {
     this.render("admin/templates/logs/screened-urls", { into: "adminLogs" });
   },
diff --git a/app/assets/javascripts/admin/routes/admin-logs-staff-action-logs.js.es6 b/app/assets/javascripts/admin/routes/admin-logs-staff-action-logs.js.es6
index fd1fea9615c..0ef8e6e2320 100644
--- a/app/assets/javascripts/admin/routes/admin-logs-staff-action-logs.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-logs-staff-action-logs.js.es6
@@ -1,6 +1,7 @@
+import DiscourseRoute from "discourse/routes/discourse";
 import showModal from "discourse/lib/show-modal";
 
-export default Discourse.Route.extend({
+export default DiscourseRoute.extend({
   // TODO: make this automatic using an `{{outlet}}`
   renderTemplate: function() {
     this.render("admin/templates/logs/staff-action-logs", {
diff --git a/app/assets/javascripts/admin/routes/admin-permalinks.js.es6 b/app/assets/javascripts/admin/routes/admin-permalinks.js.es6
index d8c3c438650..996b90aaa8e 100644
--- a/app/assets/javascripts/admin/routes/admin-permalinks.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-permalinks.js.es6
@@ -1,6 +1,7 @@
+import DiscourseRoute from "discourse/routes/discourse";
 import Permalink from "admin/models/permalink";
 
-export default Discourse.Route.extend({
+export default DiscourseRoute.extend({
   model() {
     return Permalink.findAll();
   },
diff --git a/app/assets/javascripts/admin/routes/admin-reports-index.js.es6 b/app/assets/javascripts/admin/routes/admin-reports-index.js.es6
index 2d21467ae64..864f1a3fb29 100644
--- a/app/assets/javascripts/admin/routes/admin-reports-index.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-reports-index.js.es6
@@ -1,4 +1,6 @@
-export default Discourse.Route.extend({
+import DiscourseRoute from "discourse/routes/discourse";
+
+export default DiscourseRoute.extend({
   beforeModel() {
     this.transitionTo("admin.dashboardReports");
   }
diff --git a/app/assets/javascripts/admin/routes/admin-reports-show.js.es6 b/app/assets/javascripts/admin/routes/admin-reports-show.js.es6
index 9bf9ff8ebaf..1fa8bc739d1 100644
--- a/app/assets/javascripts/admin/routes/admin-reports-show.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-reports-show.js.es6
@@ -1,4 +1,6 @@
-export default Discourse.Route.extend({
+import DiscourseRoute from "discourse/routes/discourse";
+
+export default DiscourseRoute.extend({
   queryParams: {
     start_date: { refreshModel: true },
     end_date: { refreshModel: true },
diff --git a/app/assets/javascripts/admin/routes/admin-search-logs-index.js.es6 b/app/assets/javascripts/admin/routes/admin-search-logs-index.js.es6
index 966032045ef..b01674d2f22 100644
--- a/app/assets/javascripts/admin/routes/admin-search-logs-index.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-search-logs-index.js.es6
@@ -1,6 +1,7 @@
+import DiscourseRoute from "discourse/routes/discourse";
 import { ajax } from "discourse/lib/ajax";
 
-export default Discourse.Route.extend({
+export default DiscourseRoute.extend({
   queryParams: {
     period: { refreshModel: true },
     searchType: { refreshModel: true }
diff --git a/app/assets/javascripts/admin/routes/admin-search-logs-term.js.es6 b/app/assets/javascripts/admin/routes/admin-search-logs-term.js.es6
index 40d3e25be64..a0cd40d8b07 100644
--- a/app/assets/javascripts/admin/routes/admin-search-logs-term.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-search-logs-term.js.es6
@@ -1,8 +1,9 @@
+import DiscourseRoute from "discourse/routes/discourse";
 import { ajax } from "discourse/lib/ajax";
 import { fillMissingDates } from "discourse/lib/utilities";
 import { translateResults } from "discourse/lib/search";
 
-export default Discourse.Route.extend({
+export default DiscourseRoute.extend({
   queryParams: {
     term: { refreshModel: true },
     period: { refreshModel: true },
diff --git a/app/assets/javascripts/admin/routes/admin-site-settings-category.js.es6 b/app/assets/javascripts/admin/routes/admin-site-settings-category.js.es6
index a7744150830..2b680c9b83e 100644
--- a/app/assets/javascripts/admin/routes/admin-site-settings-category.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-site-settings-category.js.es6
@@ -1,4 +1,6 @@
-export default Discourse.Route.extend({
+import DiscourseRoute from "discourse/routes/discourse";
+
+export default DiscourseRoute.extend({
   model(params) {
     // The model depends on user input, so let the controller do the work:
     this.controllerFor("adminSiteSettingsCategory").set(
diff --git a/app/assets/javascripts/admin/routes/admin-site-settings-index.js.es6 b/app/assets/javascripts/admin/routes/admin-site-settings-index.js.es6
index 59e851e5096..88a091c4b9b 100644
--- a/app/assets/javascripts/admin/routes/admin-site-settings-index.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-site-settings-index.js.es6
@@ -2,7 +2,9 @@
   Handles when you click the Site Settings tab in admin, but haven't
   chosen a category. It will redirect to the first category.
 **/
-export default Discourse.Route.extend({
+import DiscourseRoute from "discourse/routes/discourse";
+
+export default DiscourseRoute.extend({
   beforeModel() {
     this.replaceWith(
       "adminSiteSettingsCategory",
diff --git a/app/assets/javascripts/admin/routes/admin-site-settings.js.es6 b/app/assets/javascripts/admin/routes/admin-site-settings.js.es6
index b6c3e857ea9..ab687a4585c 100644
--- a/app/assets/javascripts/admin/routes/admin-site-settings.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-site-settings.js.es6
@@ -1,6 +1,7 @@
+import DiscourseRoute from "discourse/routes/discourse";
 import SiteSetting from "admin/models/site-setting";
 
-export default Discourse.Route.extend({
+export default DiscourseRoute.extend({
   queryParams: {
     filter: { replace: true }
   },
diff --git a/app/assets/javascripts/admin/routes/admin-user-badges.js.es6 b/app/assets/javascripts/admin/routes/admin-user-badges.js.es6
index b585117f191..cce32753d1c 100644
--- a/app/assets/javascripts/admin/routes/admin-user-badges.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-user-badges.js.es6
@@ -1,7 +1,8 @@
+import DiscourseRoute from "discourse/routes/discourse";
 import UserBadge from "discourse/models/user-badge";
 import Badge from "discourse/models/badge";
 
-export default Discourse.Route.extend({
+export default DiscourseRoute.extend({
   model() {
     const username = this.modelFor("adminUser").get("username");
     return UserBadge.findByUsername(username);
diff --git a/app/assets/javascripts/admin/routes/admin-user-fields.js.es6 b/app/assets/javascripts/admin/routes/admin-user-fields.js.es6
index c4278dc627a..ea4e0adef05 100644
--- a/app/assets/javascripts/admin/routes/admin-user-fields.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-user-fields.js.es6
@@ -1,6 +1,7 @@
+import DiscourseRoute from "discourse/routes/discourse";
 import UserField from "admin/models/user-field";
 
-export default Discourse.Route.extend({
+export default DiscourseRoute.extend({
   model: function() {
     return this.store.findAll("user-field");
   },
diff --git a/app/assets/javascripts/admin/routes/admin-user-index.js.es6 b/app/assets/javascripts/admin/routes/admin-user-index.js.es6
index 2b623dbcf83..51af9f2d2e8 100644
--- a/app/assets/javascripts/admin/routes/admin-user-index.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-user-index.js.es6
@@ -1,6 +1,7 @@
+import DiscourseRoute from "discourse/routes/discourse";
 import Group from "discourse/models/group";
 
-export default Discourse.Route.extend({
+export default DiscourseRoute.extend({
   model() {
     return this.modelFor("adminUser");
   },
diff --git a/app/assets/javascripts/admin/routes/admin-user-tl3-requirements.js.es6 b/app/assets/javascripts/admin/routes/admin-user-tl3-requirements.js.es6
index 6364e89f7c1..17cd54dc8a2 100644
--- a/app/assets/javascripts/admin/routes/admin-user-tl3-requirements.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-user-tl3-requirements.js.es6
@@ -1,4 +1,6 @@
-export default Discourse.Route.extend({
+import DiscourseRoute from "discourse/routes/discourse";
+
+export default DiscourseRoute.extend({
   model() {
     return this.modelFor("adminUser");
   }
diff --git a/app/assets/javascripts/admin/routes/admin-user.js.es6 b/app/assets/javascripts/admin/routes/admin-user.js.es6
index c25f750c253..cdb611964eb 100644
--- a/app/assets/javascripts/admin/routes/admin-user.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-user.js.es6
@@ -1,6 +1,7 @@
+import DiscourseRoute from "discourse/routes/discourse";
 import AdminUser from "admin/models/admin-user";
 
-export default Discourse.Route.extend({
+export default DiscourseRoute.extend({
   serialize(model) {
     return {
       user_id: model.get("id"),
diff --git a/app/assets/javascripts/admin/routes/admin-users-index.js.es6 b/app/assets/javascripts/admin/routes/admin-users-index.js.es6
index 8b28ea79fc4..7549cb230cf 100644
--- a/app/assets/javascripts/admin/routes/admin-users-index.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-users-index.js.es6
@@ -1,4 +1,6 @@
-export default Discourse.Route.extend({
+import DiscourseRoute from "discourse/routes/discourse";
+
+export default DiscourseRoute.extend({
   redirect: function() {
     this.transitionTo("adminUsersList");
   }
diff --git a/app/assets/javascripts/admin/routes/admin-users-list-index.js.es6 b/app/assets/javascripts/admin/routes/admin-users-list-index.js.es6
index 696345ad42f..9f15d72cff3 100644
--- a/app/assets/javascripts/admin/routes/admin-users-list-index.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-users-list-index.js.es6
@@ -1,4 +1,6 @@
-export default Discourse.Route.extend({
+import DiscourseRoute from "discourse/routes/discourse";
+
+export default DiscourseRoute.extend({
   beforeModel: function() {
     this.transitionTo("adminUsersList.show", "active");
   }
diff --git a/app/assets/javascripts/admin/routes/admin-users-list-show.js.es6 b/app/assets/javascripts/admin/routes/admin-users-list-show.js.es6
index e0c1105566c..764fe4ad341 100644
--- a/app/assets/javascripts/admin/routes/admin-users-list-show.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-users-list-show.js.es6
@@ -1,4 +1,6 @@
-export default Discourse.Route.extend({
+import DiscourseRoute from "discourse/routes/discourse";
+
+export default DiscourseRoute.extend({
   queryParams: {
     order: { refreshModel: true },
     ascending: { refreshModel: true }
diff --git a/app/assets/javascripts/admin/routes/admin-users-list.js.es6 b/app/assets/javascripts/admin/routes/admin-users-list.js.es6
index d6b76356f11..9e520d17353 100644
--- a/app/assets/javascripts/admin/routes/admin-users-list.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-users-list.js.es6
@@ -1,8 +1,9 @@
+import DiscourseRoute from "discourse/routes/discourse";
 import { exportEntity } from "discourse/lib/export-csv";
 import { outputExportResult } from "discourse/lib/export-result";
 import AdminUser from "admin/models/admin-user";
 
-export default Discourse.Route.extend({
+export default DiscourseRoute.extend({
   actions: {
     exportUsers() {
       exportEntity("user_list", {
diff --git a/app/assets/javascripts/admin/routes/admin-watched-words-action.js.es6 b/app/assets/javascripts/admin/routes/admin-watched-words-action.js.es6
index 99450e09ce2..d8c76aac5cf 100644
--- a/app/assets/javascripts/admin/routes/admin-watched-words-action.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-watched-words-action.js.es6
@@ -1,4 +1,6 @@
-export default Discourse.Route.extend({
+import DiscourseRoute from "discourse/routes/discourse";
+
+export default DiscourseRoute.extend({
   model(params) {
     this.controllerFor("adminWatchedWordsAction").set(
       "actionNameKey",
diff --git a/app/assets/javascripts/admin/routes/admin-watched-words-index.js.es6 b/app/assets/javascripts/admin/routes/admin-watched-words-index.js.es6
index 4ff2351e1b1..a957c11478b 100644
--- a/app/assets/javascripts/admin/routes/admin-watched-words-index.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-watched-words-index.js.es6
@@ -1,4 +1,6 @@
-export default Discourse.Route.extend({
+import DiscourseRoute from "discourse/routes/discourse";
+
+export default DiscourseRoute.extend({
   beforeModel() {
     this.replaceWith(
       "adminWatchedWords.action",
diff --git a/app/assets/javascripts/admin/routes/admin-watched-words.js.es6 b/app/assets/javascripts/admin/routes/admin-watched-words.js.es6
index 8970e6a6148..924ab49779e 100644
--- a/app/assets/javascripts/admin/routes/admin-watched-words.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-watched-words.js.es6
@@ -1,6 +1,7 @@
+import DiscourseRoute from "discourse/routes/discourse";
 import WatchedWord from "admin/models/watched-word";
 
-export default Discourse.Route.extend({
+export default DiscourseRoute.extend({
   queryParams: {
     filter: { replace: true }
   },
diff --git a/app/assets/javascripts/admin/routes/admin-web-hooks-show-events.js.es6 b/app/assets/javascripts/admin/routes/admin-web-hooks-show-events.js.es6
index 1e0d3220cf6..f4b6c740d26 100644
--- a/app/assets/javascripts/admin/routes/admin-web-hooks-show-events.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-web-hooks-show-events.js.es6
@@ -1,4 +1,6 @@
-export default Discourse.Route.extend({
+import DiscourseRoute from "discourse/routes/discourse";
+
+export default DiscourseRoute.extend({
   model(params) {
     return this.store.findAll(
       "web-hook-event",
diff --git a/app/assets/javascripts/admin/routes/admin-web-hooks-show.js.es6 b/app/assets/javascripts/admin/routes/admin-web-hooks-show.js.es6
index 611b015dcb0..b68675740d8 100644
--- a/app/assets/javascripts/admin/routes/admin-web-hooks-show.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-web-hooks-show.js.es6
@@ -1,4 +1,6 @@
-export default Discourse.Route.extend({
+import DiscourseRoute from "discourse/routes/discourse";
+
+export default DiscourseRoute.extend({
   serialize(model) {
     return { web_hook_id: model.get("id") || "new" };
   },
diff --git a/app/assets/javascripts/admin/routes/admin.js.es6 b/app/assets/javascripts/admin/routes/admin.js.es6
index fa373dd9373..bc4e8173ef6 100644
--- a/app/assets/javascripts/admin/routes/admin.js.es6
+++ b/app/assets/javascripts/admin/routes/admin.js.es6
@@ -1,4 +1,6 @@
-export default Discourse.Route.extend({
+import DiscourseRoute from "discourse/routes/discourse";
+
+export default DiscourseRoute.extend({
   titleToken() {
     return I18n.t("admin_title");
   },
diff --git a/app/assets/javascripts/discourse/lib/static-route-builder.js.es6 b/app/assets/javascripts/discourse/lib/static-route-builder.js.es6
index efc97411c0a..8baa97fb4df 100644
--- a/app/assets/javascripts/discourse/lib/static-route-builder.js.es6
+++ b/app/assets/javascripts/discourse/lib/static-route-builder.js.es6
@@ -1,3 +1,4 @@
+import DiscourseRoute from "discourse/routes/discourse";
 import StaticPage from "discourse/models/static-page";
 import { default as DiscourseURL, jumpToElement } from "discourse/lib/url";
 
@@ -8,7 +9,7 @@ const configs = {
 };
 
 export default function(page) {
-  return Discourse.Route.extend({
+  return DiscourseRoute.extend({
     renderTemplate() {
       this.render("static");
     },
diff --git a/app/assets/javascripts/discourse/routes/about.js.es6 b/app/assets/javascripts/discourse/routes/about.js.es6
index 3b19492a6b1..f7d88a8421e 100644
--- a/app/assets/javascripts/discourse/routes/about.js.es6
+++ b/app/assets/javascripts/discourse/routes/about.js.es6
@@ -1,5 +1,7 @@
 import { ajax } from "discourse/lib/ajax";
-export default Discourse.Route.extend({
+import DiscourseRoute from "discourse/routes/discourse";
+
+export default DiscourseRoute.extend({
   model() {
     return ajax("/about.json").then(result => {
       let activeAdmins = [];
diff --git a/app/assets/javascripts/discourse/routes/application.js.es6 b/app/assets/javascripts/discourse/routes/application.js.es6
index b80b8fe08f5..4130d7ffe63 100644
--- a/app/assets/javascripts/discourse/routes/application.js.es6
+++ b/app/assets/javascripts/discourse/routes/application.js.es6
@@ -1,3 +1,4 @@
+import DiscourseRoute from "discourse/routes/discourse";
 import { ajax } from "discourse/lib/ajax";
 import { setting } from "discourse/lib/computed";
 import logout from "discourse/lib/logout";
@@ -20,7 +21,7 @@ function unlessReadOnly(method, message) {
   };
 }
 
-const ApplicationRoute = Discourse.Route.extend(OpenComposer, {
+const ApplicationRoute = DiscourseRoute.extend(OpenComposer, {
   siteTitle: setting("title"),
   shortSiteDescription: setting("short_site_description"),
 
diff --git a/app/assets/javascripts/discourse/routes/associate-account.js.es6 b/app/assets/javascripts/discourse/routes/associate-account.js.es6
index d89654e0784..7cbfee67548 100644
--- a/app/assets/javascripts/discourse/routes/associate-account.js.es6
+++ b/app/assets/javascripts/discourse/routes/associate-account.js.es6
@@ -1,8 +1,9 @@
+import DiscourseRoute from "discourse/routes/discourse";
 import { ajax } from "discourse/lib/ajax";
 import showModal from "discourse/lib/show-modal";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 
-export default Discourse.Route.extend({
+export default DiscourseRoute.extend({
   beforeModel() {
     const params = this.paramsFor("associate-account");
     this.replaceWith(`preferences.account`, this.currentUser).then(() =>
diff --git a/app/assets/javascripts/discourse/routes/badges-index.js.es6 b/app/assets/javascripts/discourse/routes/badges-index.js.es6
index 2df72ea5845..c4acb15592f 100644
--- a/app/assets/javascripts/discourse/routes/badges-index.js.es6
+++ b/app/assets/javascripts/discourse/routes/badges-index.js.es6
@@ -1,7 +1,8 @@
+import DiscourseRoute from "discourse/routes/discourse";
 import Badge from "discourse/models/badge";
 import PreloadStore from "preload-store";
 
-export default Discourse.Route.extend({
+export default DiscourseRoute.extend({
   model() {
     if (PreloadStore.get("badges")) {
       return PreloadStore.getAndRemove("badges").then(json =>
diff --git a/app/assets/javascripts/discourse/routes/badges-show.js.es6 b/app/assets/javascripts/discourse/routes/badges-show.js.es6
index 3507beac99b..9197a77cc14 100644
--- a/app/assets/javascripts/discourse/routes/badges-show.js.es6
+++ b/app/assets/javascripts/discourse/routes/badges-show.js.es6
@@ -1,8 +1,9 @@
+import DiscourseRoute from "discourse/routes/discourse";
 import UserBadge from "discourse/models/user-badge";
 import Badge from "discourse/models/badge";
 import PreloadStore from "preload-store";
 
-export default Discourse.Route.extend({
+export default DiscourseRoute.extend({
   queryParams: {
     username: {
       refreshModel: true
diff --git a/app/assets/javascripts/discourse/routes/build-admin-user-posts-route.js.es6 b/app/assets/javascripts/discourse/routes/build-admin-user-posts-route.js.es6
index bc801133105..5bbd0108c68 100644
--- a/app/assets/javascripts/discourse/routes/build-admin-user-posts-route.js.es6
+++ b/app/assets/javascripts/discourse/routes/build-admin-user-posts-route.js.es6
@@ -1,7 +1,8 @@
+import DiscourseRoute from "discourse/routes/discourse";
 import { emojiUnescape } from "discourse/lib/text";
 
 export default function(filter) {
-  return Discourse.Route.extend({
+  return DiscourseRoute.extend({
     actions: {
       didTransition() {
         this.controllerFor("user").set("indexStream", true);
diff --git a/app/assets/javascripts/discourse/routes/build-category-route.js.es6 b/app/assets/javascripts/discourse/routes/build-category-route.js.es6
index aadf72eb35f..99c41ed6403 100644
--- a/app/assets/javascripts/discourse/routes/build-category-route.js.es6
+++ b/app/assets/javascripts/discourse/routes/build-category-route.js.es6
@@ -1,3 +1,4 @@
+import DiscourseRoute from "discourse/routes/discourse";
 import {
   filterQueryParams,
   findTopicList
@@ -10,7 +11,7 @@ import Category from "discourse/models/category";
 
 // A helper function to create a category route with parameters
 export default (filterArg, params) => {
-  return Discourse.Route.extend({
+  return DiscourseRoute.extend({
     queryParams,
 
     model(modelParams) {
diff --git a/app/assets/javascripts/discourse/routes/build-topic-route.js.es6 b/app/assets/javascripts/discourse/routes/build-topic-route.js.es6
index 72db37455bf..e892876dfe3 100644
--- a/app/assets/javascripts/discourse/routes/build-topic-route.js.es6
+++ b/app/assets/javascripts/discourse/routes/build-topic-route.js.es6
@@ -1,3 +1,4 @@
+import DiscourseRoute from "discourse/routes/discourse";
 import { queryParams } from "discourse/controllers/discovery-sortable";
 import { defaultHomepage } from "discourse/lib/utilities";
 
@@ -70,7 +71,7 @@ function findTopicList(store, tracking, filter, filterParams, extras) {
 
 export default function(filter, extras) {
   extras = extras || {};
-  return Discourse.Route.extend(
+  return DiscourseRoute.extend(
     {
       queryParams,
 
diff --git a/app/assets/javascripts/discourse/routes/discovery-categories.js.es6 b/app/assets/javascripts/discourse/routes/discovery-categories.js.es6
index 49605dd6c3e..a6eb60b2937 100644
--- a/app/assets/javascripts/discourse/routes/discovery-categories.js.es6
+++ b/app/assets/javascripts/discourse/routes/discovery-categories.js.es6
@@ -1,3 +1,4 @@
+import DiscourseRoute from "discourse/routes/discourse";
 import showModal from "discourse/lib/show-modal";
 import OpenComposer from "discourse/mixins/open-composer";
 import CategoryList from "discourse/models/category-list";
@@ -7,7 +8,7 @@ import { ajax } from "discourse/lib/ajax";
 import PreloadStore from "preload-store";
 import { searchPriorities } from "discourse/components/concerns/category-search-priorities";
 
-const DiscoveryCategoriesRoute = Discourse.Route.extend(OpenComposer, {
+const DiscoveryCategoriesRoute = DiscourseRoute.extend(OpenComposer, {
   renderTemplate() {
     this.render("navigation/categories", { outlet: "navigation-bar" });
     this.render("discovery/categories", { outlet: "list-container" });
diff --git a/app/assets/javascripts/discourse/routes/discovery.js.es6 b/app/assets/javascripts/discourse/routes/discovery.js.es6
index 234ef159303..68796918ef0 100644
--- a/app/assets/javascripts/discourse/routes/discovery.js.es6
+++ b/app/assets/javascripts/discourse/routes/discovery.js.es6
@@ -2,10 +2,11 @@
   The parent route for all discovery routes.
   Handles the logic for showing the loading spinners.
 **/
+import DiscourseRoute from "discourse/routes/discourse";
 import OpenComposer from "discourse/mixins/open-composer";
 import { scrollTop } from "discourse/mixins/scroll-top";
 
-export default Discourse.Route.extend(OpenComposer, {
+export default DiscourseRoute.extend(OpenComposer, {
   redirect() {
     return this.redirectIfLoginRequired();
   },
diff --git a/app/assets/javascripts/discourse/routes/email-login.js.es6 b/app/assets/javascripts/discourse/routes/email-login.js.es6
index 617de051cd5..642d5ee3d67 100644
--- a/app/assets/javascripts/discourse/routes/email-login.js.es6
+++ b/app/assets/javascripts/discourse/routes/email-login.js.es6
@@ -1,6 +1,7 @@
+import DiscourseRoute from "discourse/routes/discourse";
 import { ajax } from "discourse/lib/ajax";
 
-export default Discourse.Route.extend({
+export default DiscourseRoute.extend({
   titleToken() {
     return I18n.t("login.title");
   },
diff --git a/app/assets/javascripts/discourse/routes/exception.js.es6 b/app/assets/javascripts/discourse/routes/exception.js.es6
index 1b64efb9a65..d90cd0fb765 100644
--- a/app/assets/javascripts/discourse/routes/exception.js.es6
+++ b/app/assets/javascripts/discourse/routes/exception.js.es6
@@ -1,4 +1,6 @@
-export default Discourse.Route.extend({
+import DiscourseRoute from "discourse/routes/discourse";
+
+export default DiscourseRoute.extend({
   serialize() {
     return "";
   },
diff --git a/app/assets/javascripts/discourse/routes/full-page-search.js.es6 b/app/assets/javascripts/discourse/routes/full-page-search.js.es6
index 97ec4772e7b..ca7906e1093 100644
--- a/app/assets/javascripts/discourse/routes/full-page-search.js.es6
+++ b/app/assets/javascripts/discourse/routes/full-page-search.js.es6
@@ -1,3 +1,4 @@
+import DiscourseRoute from "discourse/routes/discourse";
 import { ajax } from "discourse/lib/ajax";
 import {
   translateResults,
@@ -8,7 +9,7 @@ import PreloadStore from "preload-store";
 import { getTransient, setTransient } from "discourse/lib/page-tracker";
 import { escapeExpression } from "discourse/lib/utilities";
 
-export default Discourse.Route.extend({
+export default DiscourseRoute.extend({
   queryParams: {
     q: {},
     expanded: false,
diff --git a/app/assets/javascripts/discourse/routes/group-activity-posts.js.es6 b/app/assets/javascripts/discourse/routes/group-activity-posts.js.es6
index 62aad289456..77a8c600cdb 100644
--- a/app/assets/javascripts/discourse/routes/group-activity-posts.js.es6
+++ b/app/assets/javascripts/discourse/routes/group-activity-posts.js.es6
@@ -1,5 +1,7 @@
+import DiscourseRoute from "discourse/routes/discourse";
+
 export function buildGroupPage(type) {
-  return Discourse.Route.extend({
+  return DiscourseRoute.extend({
     type,
 
     titleToken() {
diff --git a/app/assets/javascripts/discourse/routes/group-activity-topics.js.es6 b/app/assets/javascripts/discourse/routes/group-activity-topics.js.es6
index a36ec0e6e54..b1b77f40b7a 100644
--- a/app/assets/javascripts/discourse/routes/group-activity-topics.js.es6
+++ b/app/assets/javascripts/discourse/routes/group-activity-topics.js.es6
@@ -1,4 +1,6 @@
-export default Discourse.Route.extend({
+import DiscourseRoute from "discourse/routes/discourse";
+
+export default DiscourseRoute.extend({
   titleToken() {
     return I18n.t(`groups.topics`);
   },
diff --git a/app/assets/javascripts/discourse/routes/group-index.js.es6 b/app/assets/javascripts/discourse/routes/group-index.js.es6
index 2aab4410ab7..a8f630df0ff 100644
--- a/app/assets/javascripts/discourse/routes/group-index.js.es6
+++ b/app/assets/javascripts/discourse/routes/group-index.js.es6
@@ -1,6 +1,7 @@
+import DiscourseRoute from "discourse/routes/discourse";
 import showModal from "discourse/lib/show-modal";
 
-export default Discourse.Route.extend({
+export default DiscourseRoute.extend({
   titleToken() {
     return I18n.t("groups.members.title");
   },
diff --git a/app/assets/javascripts/discourse/routes/group-manage-index.js.es6 b/app/assets/javascripts/discourse/routes/group-manage-index.js.es6
index 590722bb0fa..4e9cf5c71cd 100644
--- a/app/assets/javascripts/discourse/routes/group-manage-index.js.es6
+++ b/app/assets/javascripts/discourse/routes/group-manage-index.js.es6
@@ -1,4 +1,6 @@
-export default Discourse.Route.extend({
+import DiscourseRoute from "discourse/routes/discourse";
+
+export default DiscourseRoute.extend({
   showFooter: true,
 
   beforeModel() {
diff --git a/app/assets/javascripts/discourse/routes/group-manage-interaction.js.es6 b/app/assets/javascripts/discourse/routes/group-manage-interaction.js.es6
index e8f3be3da2d..e273e2d22ff 100644
--- a/app/assets/javascripts/discourse/routes/group-manage-interaction.js.es6
+++ b/app/assets/javascripts/discourse/routes/group-manage-interaction.js.es6
@@ -1,4 +1,6 @@
-export default Discourse.Route.extend({
+import DiscourseRoute from "discourse/routes/discourse";
+
+export default DiscourseRoute.extend({
   showFooter: true,
 
   titleToken() {
diff --git a/app/assets/javascripts/discourse/routes/group-manage-logs.js.es6 b/app/assets/javascripts/discourse/routes/group-manage-logs.js.es6
index 56b092ecfe9..ad49c84619b 100644
--- a/app/assets/javascripts/discourse/routes/group-manage-logs.js.es6
+++ b/app/assets/javascripts/discourse/routes/group-manage-logs.js.es6
@@ -1,4 +1,6 @@
-export default Discourse.Route.extend({
+import DiscourseRoute from "discourse/routes/discourse";
+
+export default DiscourseRoute.extend({
   titleToken() {
     return I18n.t("groups.manage.logs.title");
   },
diff --git a/app/assets/javascripts/discourse/routes/group-manage-membership.js.es6 b/app/assets/javascripts/discourse/routes/group-manage-membership.js.es6
index 37746f3e91e..1ded3e2b077 100644
--- a/app/assets/javascripts/discourse/routes/group-manage-membership.js.es6
+++ b/app/assets/javascripts/discourse/routes/group-manage-membership.js.es6
@@ -1,4 +1,6 @@
-export default Discourse.Route.extend({
+import DiscourseRoute from "discourse/routes/discourse";
+
+export default DiscourseRoute.extend({
   showFooter: true,
 
   titleToken() {
diff --git a/app/assets/javascripts/discourse/routes/group-manage-profile.js.es6 b/app/assets/javascripts/discourse/routes/group-manage-profile.js.es6
index e0f133e0ceb..b720151ff43 100644
--- a/app/assets/javascripts/discourse/routes/group-manage-profile.js.es6
+++ b/app/assets/javascripts/discourse/routes/group-manage-profile.js.es6
@@ -1,4 +1,6 @@
-export default Discourse.Route.extend({
+import DiscourseRoute from "discourse/routes/discourse";
+
+export default DiscourseRoute.extend({
   showFooter: true,
 
   titleToken() {
diff --git a/app/assets/javascripts/discourse/routes/group-manage.js.es6 b/app/assets/javascripts/discourse/routes/group-manage.js.es6
index 54122bcbd42..70b5f053c7f 100644
--- a/app/assets/javascripts/discourse/routes/group-manage.js.es6
+++ b/app/assets/javascripts/discourse/routes/group-manage.js.es6
@@ -1,4 +1,6 @@
-export default Discourse.Route.extend({
+import DiscourseRoute from "discourse/routes/discourse";
+
+export default DiscourseRoute.extend({
   showFooter: true,
 
   titleToken() {
diff --git a/app/assets/javascripts/discourse/routes/group-members.js.es6 b/app/assets/javascripts/discourse/routes/group-members.js.es6
index 8ec71ae22ae..872052de679 100644
--- a/app/assets/javascripts/discourse/routes/group-members.js.es6
+++ b/app/assets/javascripts/discourse/routes/group-members.js.es6
@@ -1,4 +1,6 @@
-export default Discourse.Route.extend({
+import DiscourseRoute from "discourse/routes/discourse";
+
+export default DiscourseRoute.extend({
   beforeModel: function() {
     this.transitionTo("group.index");
   }
diff --git a/app/assets/javascripts/discourse/routes/group-messages.js.es6 b/app/assets/javascripts/discourse/routes/group-messages.js.es6
index 82f26f93e2e..1a605ec1689 100644
--- a/app/assets/javascripts/discourse/routes/group-messages.js.es6
+++ b/app/assets/javascripts/discourse/routes/group-messages.js.es6
@@ -1,4 +1,6 @@
-export default Discourse.Route.extend({
+import DiscourseRoute from "discourse/routes/discourse";
+
+export default DiscourseRoute.extend({
   titleToken() {
     return I18n.t("groups.messages");
   },
diff --git a/app/assets/javascripts/discourse/routes/group-requests.js.es6 b/app/assets/javascripts/discourse/routes/group-requests.js.es6
index c469c9895ab..b299bb01bff 100644
--- a/app/assets/javascripts/discourse/routes/group-requests.js.es6
+++ b/app/assets/javascripts/discourse/routes/group-requests.js.es6
@@ -1,4 +1,6 @@
-export default Discourse.Route.extend({
+import DiscourseRoute from "discourse/routes/discourse";
+
+export default DiscourseRoute.extend({
   titleToken() {
     return I18n.t("groups.requests.title");
   },
diff --git a/app/assets/javascripts/discourse/routes/group.js.es6 b/app/assets/javascripts/discourse/routes/group.js.es6
index 9e2c7f87dea..bd58f6d3a7f 100644
--- a/app/assets/javascripts/discourse/routes/group.js.es6
+++ b/app/assets/javascripts/discourse/routes/group.js.es6
@@ -1,4 +1,6 @@
-export default Discourse.Route.extend({
+import DiscourseRoute from "discourse/routes/discourse";
+
+export default DiscourseRoute.extend({
   titleToken() {
     return [this.modelFor("group").get("name")];
   },
diff --git a/app/assets/javascripts/discourse/routes/groups-index.js.es6 b/app/assets/javascripts/discourse/routes/groups-index.js.es6
index e7189d778fd..a510bd93b6b 100644
--- a/app/assets/javascripts/discourse/routes/groups-index.js.es6
+++ b/app/assets/javascripts/discourse/routes/groups-index.js.es6
@@ -1,4 +1,6 @@
-export default Discourse.Route.extend({
+import DiscourseRoute from "discourse/routes/discourse";
+
+export default DiscourseRoute.extend({
   titleToken() {
     return I18n.t("groups.index.title");
   },
diff --git a/app/assets/javascripts/discourse/routes/groups-new.js.es6 b/app/assets/javascripts/discourse/routes/groups-new.js.es6
index 8c2bbd29a72..67f76347d9b 100644
--- a/app/assets/javascripts/discourse/routes/groups-new.js.es6
+++ b/app/assets/javascripts/discourse/routes/groups-new.js.es6
@@ -1,6 +1,7 @@
+import DiscourseRoute from "discourse/routes/discourse";
 import Group from "discourse/models/group";
 
-export default Discourse.Route.extend({
+export default DiscourseRoute.extend({
   showFooter: true,
 
   titleToken() {
diff --git a/app/assets/javascripts/discourse/routes/invites-show.js.es6 b/app/assets/javascripts/discourse/routes/invites-show.js.es6
index 93f4bdcc405..7ec701b8427 100644
--- a/app/assets/javascripts/discourse/routes/invites-show.js.es6
+++ b/app/assets/javascripts/discourse/routes/invites-show.js.es6
@@ -1,6 +1,7 @@
+import DiscourseRoute from "discourse/routes/discourse";
 import PreloadStore from "preload-store";
 
-export default Discourse.Route.extend({
+export default DiscourseRoute.extend({
   titleToken() {
     return I18n.t("invites.accept_title");
   },
diff --git a/app/assets/javascripts/discourse/routes/new-message.js.es6 b/app/assets/javascripts/discourse/routes/new-message.js.es6
index 42b664fde54..1410c65356f 100644
--- a/app/assets/javascripts/discourse/routes/new-message.js.es6
+++ b/app/assets/javascripts/discourse/routes/new-message.js.es6
@@ -1,7 +1,8 @@
+import DiscourseRoute from "discourse/routes/discourse";
 import User from "discourse/models/user";
 import Group from "discourse/models/group";
 
-export default Discourse.Route.extend({
+export default DiscourseRoute.extend({
   beforeModel(transition) {
     const params = transition.to.queryParams;
 
diff --git a/app/assets/javascripts/discourse/routes/new-topic.js.es6 b/app/assets/javascripts/discourse/routes/new-topic.js.es6
index 266276fd064..82b2b496efa 100644
--- a/app/assets/javascripts/discourse/routes/new-topic.js.es6
+++ b/app/assets/javascripts/discourse/routes/new-topic.js.es6
@@ -1,6 +1,7 @@
+import DiscourseRoute from "discourse/routes/discourse";
 import Category from "discourse/models/category";
 
-export default Discourse.Route.extend({
+export default DiscourseRoute.extend({
   beforeModel(transition) {
     if (this.currentUser) {
       let category, categoryId;
diff --git a/app/assets/javascripts/discourse/routes/password-reset.js.es6 b/app/assets/javascripts/discourse/routes/password-reset.js.es6
index a0ccc31484d..393b19f96ae 100644
--- a/app/assets/javascripts/discourse/routes/password-reset.js.es6
+++ b/app/assets/javascripts/discourse/routes/password-reset.js.es6
@@ -1,8 +1,9 @@
+import DiscourseRoute from "discourse/routes/discourse";
 import PreloadStore from "preload-store";
 import { ajax } from "discourse/lib/ajax";
 import { userPath } from "discourse/lib/url";
 
-export default Discourse.Route.extend({
+export default DiscourseRoute.extend({
   titleToken() {
     return I18n.t("login.reset_password");
   },
diff --git a/app/assets/javascripts/discourse/routes/post.js.es6 b/app/assets/javascripts/discourse/routes/post.js.es6
index c63a71243cc..15b8aa3d1a8 100644
--- a/app/assets/javascripts/discourse/routes/post.js.es6
+++ b/app/assets/javascripts/discourse/routes/post.js.es6
@@ -1,6 +1,7 @@
+import DiscourseRoute from "discourse/routes/discourse";
 import { ajax } from "discourse/lib/ajax";
 
-export default Discourse.Route.extend({
+export default DiscourseRoute.extend({
   beforeModel({ params }) {
     return ajax(`/p/${params.post.id}`).then(t => {
       this.transitionTo(
diff --git a/app/assets/javascripts/discourse/routes/review-index.js.es6 b/app/assets/javascripts/discourse/routes/review-index.js.es6
index b6ba62ab451..d5b2fad3701 100644
--- a/app/assets/javascripts/discourse/routes/review-index.js.es6
+++ b/app/assets/javascripts/discourse/routes/review-index.js.es6
@@ -1,4 +1,6 @@
-export default Discourse.Route.extend({
+import DiscourseRoute from "discourse/routes/discourse";
+
+export default DiscourseRoute.extend({
   model(params) {
     return this.store.findAll("reviewable", params);
   },
diff --git a/app/assets/javascripts/discourse/routes/review-settings.js.es6 b/app/assets/javascripts/discourse/routes/review-settings.js.es6
index 46ed6f10fa5..bb5e2e5fb12 100644
--- a/app/assets/javascripts/discourse/routes/review-settings.js.es6
+++ b/app/assets/javascripts/discourse/routes/review-settings.js.es6
@@ -1,4 +1,6 @@
-export default Discourse.Route.extend({
+import DiscourseRoute from "discourse/routes/discourse";
+
+export default DiscourseRoute.extend({
   model() {
     return this.store.find("reviewable-settings");
   },
diff --git a/app/assets/javascripts/discourse/routes/review-show.js.es6 b/app/assets/javascripts/discourse/routes/review-show.js.es6
index afe7b30a5d5..2d6d9795d45 100644
--- a/app/assets/javascripts/discourse/routes/review-show.js.es6
+++ b/app/assets/javascripts/discourse/routes/review-show.js.es6
@@ -1,4 +1,6 @@
-export default Discourse.Route.extend({
+import DiscourseRoute from "discourse/routes/discourse";
+
+export default DiscourseRoute.extend({
   setupController(controller, model) {
     controller.set("reviewable", model);
   }
diff --git a/app/assets/javascripts/discourse/routes/review-topics.js.es6 b/app/assets/javascripts/discourse/routes/review-topics.js.es6
index 7c3f058fbd6..262194ed00b 100644
--- a/app/assets/javascripts/discourse/routes/review-topics.js.es6
+++ b/app/assets/javascripts/discourse/routes/review-topics.js.es6
@@ -1,4 +1,6 @@
-export default Discourse.Route.extend({
+import DiscourseRoute from "discourse/routes/discourse";
+
+export default DiscourseRoute.extend({
   model() {
     return this.store.findAll("reviewable-topic");
   },
diff --git a/app/assets/javascripts/discourse/routes/review.js.es6 b/app/assets/javascripts/discourse/routes/review.js.es6
index 6343919dfcb..9c28f22c549 100644
--- a/app/assets/javascripts/discourse/routes/review.js.es6
+++ b/app/assets/javascripts/discourse/routes/review.js.es6
@@ -1,4 +1,6 @@
-export default Discourse.Route.extend({
+import DiscourseRoute from "discourse/routes/discourse";
+
+export default DiscourseRoute.extend({
   titleToken() {
     return I18n.t("review.title");
   }
diff --git a/app/assets/javascripts/discourse/routes/tag-groups-show.js.es6 b/app/assets/javascripts/discourse/routes/tag-groups-show.js.es6
index 165ae49d4ab..7593f364bed 100644
--- a/app/assets/javascripts/discourse/routes/tag-groups-show.js.es6
+++ b/app/assets/javascripts/discourse/routes/tag-groups-show.js.es6
@@ -1,4 +1,6 @@
-export default Discourse.Route.extend({
+import DiscourseRoute from "discourse/routes/discourse";
+
+export default DiscourseRoute.extend({
   showFooter: true,
 
   model(params) {
diff --git a/app/assets/javascripts/discourse/routes/tag-groups.js.es6 b/app/assets/javascripts/discourse/routes/tag-groups.js.es6
index ccc7d79b752..1010b04c031 100644
--- a/app/assets/javascripts/discourse/routes/tag-groups.js.es6
+++ b/app/assets/javascripts/discourse/routes/tag-groups.js.es6
@@ -1,4 +1,6 @@
-export default Discourse.Route.extend({
+import DiscourseRoute from "discourse/routes/discourse";
+
+export default DiscourseRoute.extend({
   showFooter: true,
 
   model() {
diff --git a/app/assets/javascripts/discourse/routes/tags-index.js.es6 b/app/assets/javascripts/discourse/routes/tags-index.js.es6
index c9436e876dc..99cd3a211d8 100644
--- a/app/assets/javascripts/discourse/routes/tags-index.js.es6
+++ b/app/assets/javascripts/discourse/routes/tags-index.js.es6
@@ -1,6 +1,7 @@
+import DiscourseRoute from "discourse/routes/discourse";
 import Tag from "discourse/models/tag";
 
-export default Discourse.Route.extend({
+export default DiscourseRoute.extend({
   model() {
     return this.store.findAll("tag").then(result => {
       if (result.extras) {
diff --git a/app/assets/javascripts/discourse/routes/tags-show.js.es6 b/app/assets/javascripts/discourse/routes/tags-show.js.es6
index 3a10287935e..7bf26e26a9b 100644
--- a/app/assets/javascripts/discourse/routes/tags-show.js.es6
+++ b/app/assets/javascripts/discourse/routes/tags-show.js.es6
@@ -1,3 +1,4 @@
+import DiscourseRoute from "discourse/routes/discourse";
 import Composer from "discourse/models/composer";
 import showModal from "discourse/lib/show-modal";
 import {
@@ -7,7 +8,7 @@ import {
 import { queryParams } from "discourse/controllers/discovery-sortable";
 import PermissionType from "discourse/models/permission-type";
 
-export default Discourse.Route.extend({
+export default DiscourseRoute.extend({
   navMode: "latest",
 
   queryParams,
diff --git a/app/assets/javascripts/discourse/routes/topic-by-slug-or-id.js.es6 b/app/assets/javascripts/discourse/routes/topic-by-slug-or-id.js.es6
index dd5b8e444b6..74556b57fcc 100644
--- a/app/assets/javascripts/discourse/routes/topic-by-slug-or-id.js.es6
+++ b/app/assets/javascripts/discourse/routes/topic-by-slug-or-id.js.es6
@@ -1,7 +1,8 @@
+import DiscourseRoute from "discourse/routes/discourse";
 import { default as Topic, ID_CONSTRAINT } from "discourse/models/topic";
 import DiscourseURL from "discourse/lib/url";
 
-export default Discourse.Route.extend({
+export default DiscourseRoute.extend({
   model(params) {
     if (params.slugOrId.match(ID_CONSTRAINT)) {
       return { url: `/t/topic/${params.slugOrId}` };
diff --git a/app/assets/javascripts/discourse/routes/topic-from-params.js.es6 b/app/assets/javascripts/discourse/routes/topic-from-params.js.es6
index c193cbe98c5..c3d0e6cf727 100644
--- a/app/assets/javascripts/discourse/routes/topic-from-params.js.es6
+++ b/app/assets/javascripts/discourse/routes/topic-from-params.js.es6
@@ -1,8 +1,9 @@
+import DiscourseRoute from "discourse/routes/discourse";
 import DiscourseURL from "discourse/lib/url";
 import Draft from "discourse/models/draft";
 
 // This route is used for retrieving a topic based on params
-export default Discourse.Route.extend({
+export default DiscourseRoute.extend({
   // Avoid default model hook
   model(params) {
     return params;
diff --git a/app/assets/javascripts/discourse/routes/topic.js.es6 b/app/assets/javascripts/discourse/routes/topic.js.es6
index 4782d2dab88..e4b168ec7a9 100644
--- a/app/assets/javascripts/discourse/routes/topic.js.es6
+++ b/app/assets/javascripts/discourse/routes/topic.js.es6
@@ -1,3 +1,4 @@
+import DiscourseRoute from "discourse/routes/discourse";
 import DiscourseURL from "discourse/lib/url";
 import { ID_CONSTRAINT } from "discourse/models/topic";
 
@@ -9,7 +10,7 @@ const SCROLL_DELAY = 500;
 
 import showModal from "discourse/lib/show-modal";
 
-const TopicRoute = Discourse.Route.extend({
+const TopicRoute = DiscourseRoute.extend({
   redirect() {
     return this.redirectIfLoginRequired();
   },
diff --git a/app/assets/javascripts/discourse/routes/unknown.js.es6 b/app/assets/javascripts/discourse/routes/unknown.js.es6
index 4b2b9935492..3df278df6fe 100644
--- a/app/assets/javascripts/discourse/routes/unknown.js.es6
+++ b/app/assets/javascripts/discourse/routes/unknown.js.es6
@@ -1,6 +1,7 @@
+import DiscourseRoute from "discourse/routes/discourse";
 import { ajax } from "discourse/lib/ajax";
 
-export default Discourse.Route.extend({
+export default DiscourseRoute.extend({
   model() {
     return ajax("/404-body", { dataType: "html" });
   }
diff --git a/app/assets/javascripts/discourse/routes/user-activity-drafts.js.es6 b/app/assets/javascripts/discourse/routes/user-activity-drafts.js.es6
index 2ca94b05e5e..392b9a62554 100644
--- a/app/assets/javascripts/discourse/routes/user-activity-drafts.js.es6
+++ b/app/assets/javascripts/discourse/routes/user-activity-drafts.js.es6
@@ -1,4 +1,6 @@
-export default Discourse.Route.extend({
+import DiscourseRoute from "discourse/routes/discourse";
+
+export default DiscourseRoute.extend({
   model() {
     let userDraftsStream = this.modelFor("user").get("userDraftsStream");
     return userDraftsStream.load(this.site).then(() => userDraftsStream);
diff --git a/app/assets/javascripts/discourse/routes/user-activity-stream.js.es6 b/app/assets/javascripts/discourse/routes/user-activity-stream.js.es6
index 8d9d1e81449..1aea1056cfc 100644
--- a/app/assets/javascripts/discourse/routes/user-activity-stream.js.es6
+++ b/app/assets/javascripts/discourse/routes/user-activity-stream.js.es6
@@ -1,6 +1,7 @@
+import DiscourseRoute from "discourse/routes/discourse";
 import ViewingActionType from "discourse/mixins/viewing-action-type";
 
-export default Discourse.Route.extend(ViewingActionType, {
+export default DiscourseRoute.extend(ViewingActionType, {
   queryParams: {
     acting_username: { refreshModel: true }
   },
diff --git a/app/assets/javascripts/discourse/routes/user-activity.js.es6 b/app/assets/javascripts/discourse/routes/user-activity.js.es6
index a827e3d9988..f36beaf1d53 100644
--- a/app/assets/javascripts/discourse/routes/user-activity.js.es6
+++ b/app/assets/javascripts/discourse/routes/user-activity.js.es6
@@ -1,4 +1,6 @@
-export default Discourse.Route.extend({
+import DiscourseRoute from "discourse/routes/discourse";
+
+export default DiscourseRoute.extend({
   model() {
     let user = this.modelFor("user");
     if (user.get("profile_hidden")) {
diff --git a/app/assets/javascripts/discourse/routes/user-badges.js.es6 b/app/assets/javascripts/discourse/routes/user-badges.js.es6
index 0efe8069fc0..ffe6008da95 100644
--- a/app/assets/javascripts/discourse/routes/user-badges.js.es6
+++ b/app/assets/javascripts/discourse/routes/user-badges.js.es6
@@ -1,7 +1,8 @@
+import DiscourseRoute from "discourse/routes/discourse";
 import ViewingActionType from "discourse/mixins/viewing-action-type";
 import UserBadge from "discourse/models/user-badge";
 
-export default Discourse.Route.extend(ViewingActionType, {
+export default DiscourseRoute.extend(ViewingActionType, {
   model() {
     return UserBadge.findByUsername(
       this.modelFor("user").get("username_lower"),
diff --git a/app/assets/javascripts/discourse/routes/user-index.js.es6 b/app/assets/javascripts/discourse/routes/user-index.js.es6
index eef87b16ebf..ca51d8fce9f 100644
--- a/app/assets/javascripts/discourse/routes/user-index.js.es6
+++ b/app/assets/javascripts/discourse/routes/user-index.js.es6
@@ -1,4 +1,6 @@
-export default Discourse.Route.extend({
+import DiscourseRoute from "discourse/routes/discourse";
+
+export default DiscourseRoute.extend({
   beforeModel() {
     const { currentUser } = this;
     const viewingMe =
diff --git a/app/assets/javascripts/discourse/routes/user-invited-index.js.es6 b/app/assets/javascripts/discourse/routes/user-invited-index.js.es6
index bf7a358215a..721f4fb8b26 100644
--- a/app/assets/javascripts/discourse/routes/user-invited-index.js.es6
+++ b/app/assets/javascripts/discourse/routes/user-invited-index.js.es6
@@ -1,4 +1,6 @@
-export default Discourse.Route.extend({
+import DiscourseRoute from "discourse/routes/discourse";
+
+export default DiscourseRoute.extend({
   beforeModel: function() {
     this.replaceWith("userInvited.show", "pending");
   }
diff --git a/app/assets/javascripts/discourse/routes/user-invited-show.js.es6 b/app/assets/javascripts/discourse/routes/user-invited-show.js.es6
index 54f367b7399..3cd83f79ceb 100644
--- a/app/assets/javascripts/discourse/routes/user-invited-show.js.es6
+++ b/app/assets/javascripts/discourse/routes/user-invited-show.js.es6
@@ -1,7 +1,8 @@
+import DiscourseRoute from "discourse/routes/discourse";
 import Invite from "discourse/models/invite";
 import showModal from "discourse/lib/show-modal";
 
-export default Discourse.Route.extend({
+export default DiscourseRoute.extend({
   model(params) {
     Invite.findInvitedCount(this.modelFor("user")).then(result =>
       this.set("invitesCount", result)
diff --git a/app/assets/javascripts/discourse/routes/user-notifications-index.js.es6 b/app/assets/javascripts/discourse/routes/user-notifications-index.js.es6
index 1e998969a39..28f00412531 100644
--- a/app/assets/javascripts/discourse/routes/user-notifications-index.js.es6
+++ b/app/assets/javascripts/discourse/routes/user-notifications-index.js.es6
@@ -1,4 +1,6 @@
-export default Discourse.Route.extend({
+import DiscourseRoute from "discourse/routes/discourse";
+
+export default DiscourseRoute.extend({
   controllerName: "user-notifications",
   renderTemplate() {
     this.render("user/notifications-index");
diff --git a/app/assets/javascripts/discourse/routes/user-notifications.js.es6 b/app/assets/javascripts/discourse/routes/user-notifications.js.es6
index e4e65c7f9bc..3feb837746c 100644
--- a/app/assets/javascripts/discourse/routes/user-notifications.js.es6
+++ b/app/assets/javascripts/discourse/routes/user-notifications.js.es6
@@ -1,6 +1,7 @@
+import DiscourseRoute from "discourse/routes/discourse";
 import ViewingActionType from "discourse/mixins/viewing-action-type";
 
-export default Discourse.Route.extend(ViewingActionType, {
+export default DiscourseRoute.extend(ViewingActionType, {
   renderTemplate() {
     this.render("user/notifications");
   },
diff --git a/app/assets/javascripts/discourse/routes/user-private-messages-tags.js.es6 b/app/assets/javascripts/discourse/routes/user-private-messages-tags.js.es6
index 7007920e385..baf5ae81d15 100644
--- a/app/assets/javascripts/discourse/routes/user-private-messages-tags.js.es6
+++ b/app/assets/javascripts/discourse/routes/user-private-messages-tags.js.es6
@@ -1,7 +1,8 @@
+import DiscourseRoute from "discourse/routes/discourse";
 import { ajax } from "discourse/lib/ajax";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 
-export default Discourse.Route.extend({
+export default DiscourseRoute.extend({
   model() {
     const username = this.modelFor("user").get("username_lower");
     return ajax(`/tags/personal_messages/${username}`)
diff --git a/app/assets/javascripts/discourse/routes/user-private-messages.js.es6 b/app/assets/javascripts/discourse/routes/user-private-messages.js.es6
index 56e00994381..ef6854e0568 100644
--- a/app/assets/javascripts/discourse/routes/user-private-messages.js.es6
+++ b/app/assets/javascripts/discourse/routes/user-private-messages.js.es6
@@ -1,7 +1,8 @@
+import DiscourseRoute from "discourse/routes/discourse";
 import Draft from "discourse/models/draft";
 import Composer from "discourse/models/composer";
 
-export default Discourse.Route.extend({
+export default DiscourseRoute.extend({
   renderTemplate() {
     this.render("user/messages");
   },
diff --git a/app/assets/javascripts/discourse/routes/user-summary.js.es6 b/app/assets/javascripts/discourse/routes/user-summary.js.es6
index 698d2f4edc5..68270635175 100644
--- a/app/assets/javascripts/discourse/routes/user-summary.js.es6
+++ b/app/assets/javascripts/discourse/routes/user-summary.js.es6
@@ -1,4 +1,6 @@
-export default Discourse.Route.extend({
+import DiscourseRoute from "discourse/routes/discourse";
+
+export default DiscourseRoute.extend({
   showFooter: true,
 
   model() {
diff --git a/app/assets/javascripts/discourse/routes/user-topic-list.js.es6 b/app/assets/javascripts/discourse/routes/user-topic-list.js.es6
index c82e0dceea7..80f2c667342 100644
--- a/app/assets/javascripts/discourse/routes/user-topic-list.js.es6
+++ b/app/assets/javascripts/discourse/routes/user-topic-list.js.es6
@@ -1,6 +1,7 @@
+import DiscourseRoute from "discourse/routes/discourse";
 import ViewingActionType from "discourse/mixins/viewing-action-type";
 
-export default Discourse.Route.extend(ViewingActionType, {
+export default DiscourseRoute.extend(ViewingActionType, {
   renderTemplate() {
     this.render("user-topics-list");
   },
diff --git a/app/assets/javascripts/discourse/routes/user.js.es6 b/app/assets/javascripts/discourse/routes/user.js.es6
index 4eaaa4c9105..af8d85ccf01 100644
--- a/app/assets/javascripts/discourse/routes/user.js.es6
+++ b/app/assets/javascripts/discourse/routes/user.js.es6
@@ -1,4 +1,6 @@
-export default Discourse.Route.extend({
+import DiscourseRoute from "discourse/routes/discourse";
+
+export default DiscourseRoute.extend({
   titleToken() {
     const username = this.modelFor("user").username;
     if (username) {
diff --git a/app/assets/javascripts/discourse/routes/users.js.es6 b/app/assets/javascripts/discourse/routes/users.js.es6
index 009ee9e88dc..b500a985b50 100644
--- a/app/assets/javascripts/discourse/routes/users.js.es6
+++ b/app/assets/javascripts/discourse/routes/users.js.es6
@@ -1,4 +1,6 @@
-export default Discourse.Route.extend({
+import DiscourseRoute from "discourse/routes/discourse";
+
+export default DiscourseRoute.extend({
   queryParams: {
     period: { refreshModel: true },
     order: { refreshModel: true },
diff --git a/lib/generators/plugin/templates/assets/javascripts/discourse/routes/route-index.js.es6.erb b/lib/generators/plugin/templates/assets/javascripts/discourse/routes/route-index.js.es6.erb
index 998eff2a6f7..4766f115e9f 100644
--- a/lib/generators/plugin/templates/assets/javascripts/discourse/routes/route-index.js.es6.erb
+++ b/lib/generators/plugin/templates/assets/javascripts/discourse/routes/route-index.js.es6.erb
@@ -1,4 +1,6 @@
-export default Discourse.Route.extend({
+import DiscourseRoute from 'discourse/routes/discourse'
+
+export default DiscourseRoute.extend({
   controllerName: "actions-index",
 
   model(params) {
diff --git a/lib/generators/plugin/templates/assets/javascripts/discourse/routes/route-show.js.es6.erb b/lib/generators/plugin/templates/assets/javascripts/discourse/routes/route-show.js.es6.erb
index 74274ebe3aa..34ef38ac50b 100644
--- a/lib/generators/plugin/templates/assets/javascripts/discourse/routes/route-show.js.es6.erb
+++ b/lib/generators/plugin/templates/assets/javascripts/discourse/routes/route-show.js.es6.erb
@@ -1,4 +1,6 @@
-export default Discourse.Route.extend({
+import DiscourseRoute from 'discourse/routes/discourse'
+
+export default DiscourseRoute.extend({
   controllerName: "actions-show",
 
   model(params) {
diff --git a/lib/generators/plugin/templates/assets/javascripts/discourse/routes/route.js.es6.erb b/lib/generators/plugin/templates/assets/javascripts/discourse/routes/route.js.es6.erb
index be3f4f1241e..702e29cdfd1 100644
--- a/lib/generators/plugin/templates/assets/javascripts/discourse/routes/route.js.es6.erb
+++ b/lib/generators/plugin/templates/assets/javascripts/discourse/routes/route.js.es6.erb
@@ -1,4 +1,6 @@
-export default Discourse.Route.extend({
+import DiscourseRoute from 'discourse/routes/discourse'
+
+export default DiscourseRoute.extend({
   controllerName: "actions",
 
   renderTemplate() {