diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index c02b8d19471..aa94465fafd 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -132,7 +132,7 @@ jobs:
         if: env.BUILD_TYPE == 'LINT'
         run: |
           yarn prettier -v
-          yarn prettier --list-different "app/assets/stylesheets/**/*.scss" "app/assets/javascripts/**/*.es6" "test/javascripts/**/*.es6" "plugins/**/*.scss" "plugins/**/*.es6"
+          yarn prettier --list-different "app/assets/stylesheets/**/*.scss" "app/assets/javascripts/**/*.js" "app/assets/javascripts/**/*.es6" "test/javascripts/**/*.es6" "plugins/**/*.scss" "plugins/**/*.es6"
 
       - name: Core RSpec
         if: env.BUILD_TYPE == 'BACKEND' && env.TARGET == 'CORE'
diff --git a/Dangerfile b/Dangerfile
index 667918b36a7..cfa678978af 100644
--- a/Dangerfile
+++ b/Dangerfile
@@ -4,7 +4,7 @@ if github.pr_json && (github.pr_json["additions"] || 0) > 250 || (github.pr_json
   warn("This pull request is big! We prefer smaller PRs whenever possible, as they are easier to review. Can this be split into a few smaller PRs?")
 end
 
-prettier_offenses = `yarn --silent prettier --list-different "app/assets/stylesheets/**/*.scss" "app/assets/javascripts/**/*.es6" "test/javascripts/**/*.es6"`.split("\n")
+prettier_offenses = `yarn --silent prettier --list-different "app/assets/stylesheets/**/*.scss" "app/assets/javascripts/**/*.js" "app/assets/javascripts/**/*.es6" "test/javascripts/**/*.es6"`.split("\n")
 
 unless prettier_offenses.empty?
   fail(%{
@@ -22,9 +22,9 @@ end
 
 files = (git.added_files + git.modified_files)
   .select { |path| !path.start_with?("plugins/") }
-  .select { |path| path.end_with?("es6") || path.end_with?("rb") }
+  .select { |path| path.end_with?("es6") || path.end_with?("js") || path.end_with?("rb") }
 
-js_files = files.select { |path| path.end_with?(".js.es6") }
+js_files = files.select { |path| path.end_with?(".js.es6") || path.end_with?(".js") }
 js_test_files = js_files.select { |path| path.end_with?("-test.js.es6") }
 
 super_offenses = []
diff --git a/app/assets/javascripts/discourse/adapters/email-template.js.es6 b/app/assets/javascripts/discourse/adapters/email-template.js
similarity index 100%
rename from app/assets/javascripts/discourse/adapters/email-template.js.es6
rename to app/assets/javascripts/discourse/adapters/email-template.js
diff --git a/app/assets/javascripts/discourse/adapters/group.js.es6 b/app/assets/javascripts/discourse/adapters/group.js
similarity index 100%
rename from app/assets/javascripts/discourse/adapters/group.js.es6
rename to app/assets/javascripts/discourse/adapters/group.js
diff --git a/app/assets/javascripts/discourse/adapters/notification.js.es6 b/app/assets/javascripts/discourse/adapters/notification.js
similarity index 100%
rename from app/assets/javascripts/discourse/adapters/notification.js.es6
rename to app/assets/javascripts/discourse/adapters/notification.js
diff --git a/app/assets/javascripts/discourse/adapters/post-reply-history.js.es6 b/app/assets/javascripts/discourse/adapters/post-reply-history.js
similarity index 100%
rename from app/assets/javascripts/discourse/adapters/post-reply-history.js.es6
rename to app/assets/javascripts/discourse/adapters/post-reply-history.js
diff --git a/app/assets/javascripts/discourse/adapters/post-reply.js.es6 b/app/assets/javascripts/discourse/adapters/post-reply.js
similarity index 100%
rename from app/assets/javascripts/discourse/adapters/post-reply.js.es6
rename to app/assets/javascripts/discourse/adapters/post-reply.js
diff --git a/app/assets/javascripts/discourse/adapters/post.js.es6 b/app/assets/javascripts/discourse/adapters/post.js
similarity index 100%
rename from app/assets/javascripts/discourse/adapters/post.js.es6
rename to app/assets/javascripts/discourse/adapters/post.js
diff --git a/app/assets/javascripts/discourse/adapters/rest.js.es6 b/app/assets/javascripts/discourse/adapters/rest.js
similarity index 100%
rename from app/assets/javascripts/discourse/adapters/rest.js.es6
rename to app/assets/javascripts/discourse/adapters/rest.js
diff --git a/app/assets/javascripts/discourse/adapters/reviewable-explanation.js.es6 b/app/assets/javascripts/discourse/adapters/reviewable-explanation.js
similarity index 100%
rename from app/assets/javascripts/discourse/adapters/reviewable-explanation.js.es6
rename to app/assets/javascripts/discourse/adapters/reviewable-explanation.js
diff --git a/app/assets/javascripts/discourse/adapters/reviewable-settings.js.es6 b/app/assets/javascripts/discourse/adapters/reviewable-settings.js
similarity index 100%
rename from app/assets/javascripts/discourse/adapters/reviewable-settings.js.es6
rename to app/assets/javascripts/discourse/adapters/reviewable-settings.js
diff --git a/app/assets/javascripts/discourse/adapters/reviewable-topic.js.es6 b/app/assets/javascripts/discourse/adapters/reviewable-topic.js
similarity index 100%
rename from app/assets/javascripts/discourse/adapters/reviewable-topic.js.es6
rename to app/assets/javascripts/discourse/adapters/reviewable-topic.js
diff --git a/app/assets/javascripts/discourse/adapters/reviewable.js.es6 b/app/assets/javascripts/discourse/adapters/reviewable.js
similarity index 100%
rename from app/assets/javascripts/discourse/adapters/reviewable.js.es6
rename to app/assets/javascripts/discourse/adapters/reviewable.js
diff --git a/app/assets/javascripts/discourse/adapters/tag-info.js.es6 b/app/assets/javascripts/discourse/adapters/tag-info.js
similarity index 100%
rename from app/assets/javascripts/discourse/adapters/tag-info.js.es6
rename to app/assets/javascripts/discourse/adapters/tag-info.js
diff --git a/app/assets/javascripts/discourse/adapters/tag-notification.js.es6 b/app/assets/javascripts/discourse/adapters/tag-notification.js
similarity index 100%
rename from app/assets/javascripts/discourse/adapters/tag-notification.js.es6
rename to app/assets/javascripts/discourse/adapters/tag-notification.js
diff --git a/app/assets/javascripts/discourse/adapters/topic-list.js.es6 b/app/assets/javascripts/discourse/adapters/topic-list.js
similarity index 100%
rename from app/assets/javascripts/discourse/adapters/topic-list.js.es6
rename to app/assets/javascripts/discourse/adapters/topic-list.js
diff --git a/app/assets/javascripts/discourse/adapters/topic.js.es6 b/app/assets/javascripts/discourse/adapters/topic.js
similarity index 100%
rename from app/assets/javascripts/discourse/adapters/topic.js.es6
rename to app/assets/javascripts/discourse/adapters/topic.js
diff --git a/app/assets/javascripts/discourse/components/about-page-users.js.es6 b/app/assets/javascripts/discourse/components/about-page-users.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/about-page-users.js.es6
rename to app/assets/javascripts/discourse/components/about-page-users.js
diff --git a/app/assets/javascripts/discourse/components/activation-controls.js.es6 b/app/assets/javascripts/discourse/components/activation-controls.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/activation-controls.js.es6
rename to app/assets/javascripts/discourse/components/activation-controls.js
diff --git a/app/assets/javascripts/discourse/components/add-category-tag-classes.js.es6 b/app/assets/javascripts/discourse/components/add-category-tag-classes.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/add-category-tag-classes.js.es6
rename to app/assets/javascripts/discourse/components/add-category-tag-classes.js
diff --git a/app/assets/javascripts/discourse/components/avatar-flair.js.es6 b/app/assets/javascripts/discourse/components/avatar-flair.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/avatar-flair.js.es6
rename to app/assets/javascripts/discourse/components/avatar-flair.js
diff --git a/app/assets/javascripts/discourse/components/avatar-uploader.js.es6 b/app/assets/javascripts/discourse/components/avatar-uploader.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/avatar-uploader.js.es6
rename to app/assets/javascripts/discourse/components/avatar-uploader.js
diff --git a/app/assets/javascripts/discourse/components/backup-codes.js.es6 b/app/assets/javascripts/discourse/components/backup-codes.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/backup-codes.js.es6
rename to app/assets/javascripts/discourse/components/backup-codes.js
diff --git a/app/assets/javascripts/discourse/components/backup-uploader.js.es6 b/app/assets/javascripts/discourse/components/backup-uploader.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/backup-uploader.js.es6
rename to app/assets/javascripts/discourse/components/backup-uploader.js
diff --git a/app/assets/javascripts/discourse/components/badge-button.js.es6 b/app/assets/javascripts/discourse/components/badge-button.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/badge-button.js.es6
rename to app/assets/javascripts/discourse/components/badge-button.js
diff --git a/app/assets/javascripts/discourse/components/badge-card.js.es6 b/app/assets/javascripts/discourse/components/badge-card.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/badge-card.js.es6
rename to app/assets/javascripts/discourse/components/badge-card.js
diff --git a/app/assets/javascripts/discourse/components/badge-selector.js.es6 b/app/assets/javascripts/discourse/components/badge-selector.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/badge-selector.js.es6
rename to app/assets/javascripts/discourse/components/badge-selector.js
diff --git a/app/assets/javascripts/discourse/components/badge-title.js.es6 b/app/assets/javascripts/discourse/components/badge-title.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/badge-title.js.es6
rename to app/assets/javascripts/discourse/components/badge-title.js
diff --git a/app/assets/javascripts/discourse/components/basic-topic-list.js.es6 b/app/assets/javascripts/discourse/components/basic-topic-list.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/basic-topic-list.js.es6
rename to app/assets/javascripts/discourse/components/basic-topic-list.js
diff --git a/app/assets/javascripts/discourse/components/bookmark-actions-dropdown.js.es6 b/app/assets/javascripts/discourse/components/bookmark-actions-dropdown.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/bookmark-actions-dropdown.js.es6
rename to app/assets/javascripts/discourse/components/bookmark-actions-dropdown.js
diff --git a/app/assets/javascripts/discourse/components/bread-crumbs.js.es6 b/app/assets/javascripts/discourse/components/bread-crumbs.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/bread-crumbs.js.es6
rename to app/assets/javascripts/discourse/components/bread-crumbs.js
diff --git a/app/assets/javascripts/discourse/components/bulk-select-button.js.es6 b/app/assets/javascripts/discourse/components/bulk-select-button.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/bulk-select-button.js.es6
rename to app/assets/javascripts/discourse/components/bulk-select-button.js
diff --git a/app/assets/javascripts/discourse/components/categories-and-latest-topics.js.es6 b/app/assets/javascripts/discourse/components/categories-and-latest-topics.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/categories-and-latest-topics.js.es6
rename to app/assets/javascripts/discourse/components/categories-and-latest-topics.js
diff --git a/app/assets/javascripts/discourse/components/categories-and-top-topics.js.es6 b/app/assets/javascripts/discourse/components/categories-and-top-topics.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/categories-and-top-topics.js.es6
rename to app/assets/javascripts/discourse/components/categories-and-top-topics.js
diff --git a/app/assets/javascripts/discourse/components/categories-boxes-topic.js.es6 b/app/assets/javascripts/discourse/components/categories-boxes-topic.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/categories-boxes-topic.js.es6
rename to app/assets/javascripts/discourse/components/categories-boxes-topic.js
diff --git a/app/assets/javascripts/discourse/components/categories-boxes-with-topics.js.es6 b/app/assets/javascripts/discourse/components/categories-boxes-with-topics.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/categories-boxes-with-topics.js.es6
rename to app/assets/javascripts/discourse/components/categories-boxes-with-topics.js
diff --git a/app/assets/javascripts/discourse/components/categories-boxes.js.es6 b/app/assets/javascripts/discourse/components/categories-boxes.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/categories-boxes.js.es6
rename to app/assets/javascripts/discourse/components/categories-boxes.js
diff --git a/app/assets/javascripts/discourse/components/categories-only.js.es6 b/app/assets/javascripts/discourse/components/categories-only.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/categories-only.js.es6
rename to app/assets/javascripts/discourse/components/categories-only.js
diff --git a/app/assets/javascripts/discourse/components/categories-topic-list.js.es6 b/app/assets/javascripts/discourse/components/categories-topic-list.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/categories-topic-list.js.es6
rename to app/assets/javascripts/discourse/components/categories-topic-list.js
diff --git a/app/assets/javascripts/discourse/components/category-title-before.js.es6 b/app/assets/javascripts/discourse/components/category-title-before.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/category-title-before.js.es6
rename to app/assets/javascripts/discourse/components/category-title-before.js
diff --git a/app/assets/javascripts/discourse/components/category-title-link.js.es6 b/app/assets/javascripts/discourse/components/category-title-link.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/category-title-link.js.es6
rename to app/assets/javascripts/discourse/components/category-title-link.js
diff --git a/app/assets/javascripts/discourse/components/category-unread.js.es6 b/app/assets/javascripts/discourse/components/category-unread.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/category-unread.js.es6
rename to app/assets/javascripts/discourse/components/category-unread.js
diff --git a/app/assets/javascripts/discourse/components/cdn-img.js.es6 b/app/assets/javascripts/discourse/components/cdn-img.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/cdn-img.js.es6
rename to app/assets/javascripts/discourse/components/cdn-img.js
diff --git a/app/assets/javascripts/discourse/components/choose-message.js.es6 b/app/assets/javascripts/discourse/components/choose-message.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/choose-message.js.es6
rename to app/assets/javascripts/discourse/components/choose-message.js
diff --git a/app/assets/javascripts/discourse/components/choose-topic.js.es6 b/app/assets/javascripts/discourse/components/choose-topic.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/choose-topic.js.es6
rename to app/assets/javascripts/discourse/components/choose-topic.js
diff --git a/app/assets/javascripts/discourse/components/color-picker-choice.js.es6 b/app/assets/javascripts/discourse/components/color-picker-choice.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/color-picker-choice.js.es6
rename to app/assets/javascripts/discourse/components/color-picker-choice.js
diff --git a/app/assets/javascripts/discourse/components/color-picker.js.es6 b/app/assets/javascripts/discourse/components/color-picker.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/color-picker.js.es6
rename to app/assets/javascripts/discourse/components/color-picker.js
diff --git a/app/assets/javascripts/discourse/components/composer-action-title.js.es6 b/app/assets/javascripts/discourse/components/composer-action-title.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/composer-action-title.js.es6
rename to app/assets/javascripts/discourse/components/composer-action-title.js
diff --git a/app/assets/javascripts/discourse/components/composer-body.js.es6 b/app/assets/javascripts/discourse/components/composer-body.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/composer-body.js.es6
rename to app/assets/javascripts/discourse/components/composer-body.js
diff --git a/app/assets/javascripts/discourse/components/composer-editor.js.es6 b/app/assets/javascripts/discourse/components/composer-editor.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/composer-editor.js.es6
rename to app/assets/javascripts/discourse/components/composer-editor.js
diff --git a/app/assets/javascripts/discourse/components/composer-message.js.es6 b/app/assets/javascripts/discourse/components/composer-message.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/composer-message.js.es6
rename to app/assets/javascripts/discourse/components/composer-message.js
diff --git a/app/assets/javascripts/discourse/components/composer-messages.js.es6 b/app/assets/javascripts/discourse/components/composer-messages.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/composer-messages.js.es6
rename to app/assets/javascripts/discourse/components/composer-messages.js
diff --git a/app/assets/javascripts/discourse/components/composer-save-button.js.es6 b/app/assets/javascripts/discourse/components/composer-save-button.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/composer-save-button.js.es6
rename to app/assets/javascripts/discourse/components/composer-save-button.js
diff --git a/app/assets/javascripts/discourse/components/composer-title.js.es6 b/app/assets/javascripts/discourse/components/composer-title.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/composer-title.js.es6
rename to app/assets/javascripts/discourse/components/composer-title.js
diff --git a/app/assets/javascripts/discourse/components/composer-toggles.js.es6 b/app/assets/javascripts/discourse/components/composer-toggles.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/composer-toggles.js.es6
rename to app/assets/javascripts/discourse/components/composer-toggles.js
diff --git a/app/assets/javascripts/discourse/components/composer-user-selector.js.es6 b/app/assets/javascripts/discourse/components/composer-user-selector.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/composer-user-selector.js.es6
rename to app/assets/javascripts/discourse/components/composer-user-selector.js
diff --git a/app/assets/javascripts/discourse/components/conditional-loading-section.js.es6 b/app/assets/javascripts/discourse/components/conditional-loading-section.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/conditional-loading-section.js.es6
rename to app/assets/javascripts/discourse/components/conditional-loading-section.js
diff --git a/app/assets/javascripts/discourse/components/conditional-loading-spinner.js.es6 b/app/assets/javascripts/discourse/components/conditional-loading-spinner.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/conditional-loading-spinner.js.es6
rename to app/assets/javascripts/discourse/components/conditional-loading-spinner.js
diff --git a/app/assets/javascripts/discourse/components/connector-container.js.es6 b/app/assets/javascripts/discourse/components/connector-container.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/connector-container.js.es6
rename to app/assets/javascripts/discourse/components/connector-container.js
diff --git a/app/assets/javascripts/discourse/components/cook-text.js.es6 b/app/assets/javascripts/discourse/components/cook-text.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/cook-text.js.es6
rename to app/assets/javascripts/discourse/components/cook-text.js
diff --git a/app/assets/javascripts/discourse/components/count-i18n.js.es6 b/app/assets/javascripts/discourse/components/count-i18n.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/count-i18n.js.es6
rename to app/assets/javascripts/discourse/components/count-i18n.js
diff --git a/app/assets/javascripts/discourse/components/create-account.js.es6 b/app/assets/javascripts/discourse/components/create-account.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/create-account.js.es6
rename to app/assets/javascripts/discourse/components/create-account.js
diff --git a/app/assets/javascripts/discourse/components/create-topic-button.js.es6 b/app/assets/javascripts/discourse/components/create-topic-button.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/create-topic-button.js.es6
rename to app/assets/javascripts/discourse/components/create-topic-button.js
diff --git a/app/assets/javascripts/discourse/components/create-topics-notice.js.es6 b/app/assets/javascripts/discourse/components/create-topics-notice.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/create-topics-notice.js.es6
rename to app/assets/javascripts/discourse/components/create-topics-notice.js
diff --git a/app/assets/javascripts/discourse/components/csv-uploader.js.es6 b/app/assets/javascripts/discourse/components/csv-uploader.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/csv-uploader.js.es6
rename to app/assets/javascripts/discourse/components/csv-uploader.js
diff --git a/app/assets/javascripts/discourse/components/custom-html.js.es6 b/app/assets/javascripts/discourse/components/custom-html.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/custom-html.js.es6
rename to app/assets/javascripts/discourse/components/custom-html.js
diff --git a/app/assets/javascripts/discourse/components/d-button.js.es6 b/app/assets/javascripts/discourse/components/d-button.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/d-button.js.es6
rename to app/assets/javascripts/discourse/components/d-button.js
diff --git a/app/assets/javascripts/discourse/components/d-editor.js.es6 b/app/assets/javascripts/discourse/components/d-editor.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/d-editor.js.es6
rename to app/assets/javascripts/discourse/components/d-editor.js
diff --git a/app/assets/javascripts/discourse/components/d-modal-body.js.es6 b/app/assets/javascripts/discourse/components/d-modal-body.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/d-modal-body.js.es6
rename to app/assets/javascripts/discourse/components/d-modal-body.js
diff --git a/app/assets/javascripts/discourse/components/d-modal-cancel.js.es6 b/app/assets/javascripts/discourse/components/d-modal-cancel.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/d-modal-cancel.js.es6
rename to app/assets/javascripts/discourse/components/d-modal-cancel.js
diff --git a/app/assets/javascripts/discourse/components/d-modal.js.es6 b/app/assets/javascripts/discourse/components/d-modal.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/d-modal.js.es6
rename to app/assets/javascripts/discourse/components/d-modal.js
diff --git a/app/assets/javascripts/discourse/components/d-navigation.js.es6 b/app/assets/javascripts/discourse/components/d-navigation.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/d-navigation.js.es6
rename to app/assets/javascripts/discourse/components/d-navigation.js
diff --git a/app/assets/javascripts/discourse/components/d-section.js.es6 b/app/assets/javascripts/discourse/components/d-section.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/d-section.js.es6
rename to app/assets/javascripts/discourse/components/d-section.js
diff --git a/app/assets/javascripts/discourse/components/date-input.js.es6 b/app/assets/javascripts/discourse/components/date-input.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/date-input.js.es6
rename to app/assets/javascripts/discourse/components/date-input.js
diff --git a/app/assets/javascripts/discourse/components/date-picker-future.js.es6 b/app/assets/javascripts/discourse/components/date-picker-future.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/date-picker-future.js.es6
rename to app/assets/javascripts/discourse/components/date-picker-future.js
diff --git a/app/assets/javascripts/discourse/components/date-picker-past.js.es6 b/app/assets/javascripts/discourse/components/date-picker-past.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/date-picker-past.js.es6
rename to app/assets/javascripts/discourse/components/date-picker-past.js
diff --git a/app/assets/javascripts/discourse/components/date-picker.js.es6 b/app/assets/javascripts/discourse/components/date-picker.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/date-picker.js.es6
rename to app/assets/javascripts/discourse/components/date-picker.js
diff --git a/app/assets/javascripts/discourse/components/date-time-input-range.js.es6 b/app/assets/javascripts/discourse/components/date-time-input-range.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/date-time-input-range.js.es6
rename to app/assets/javascripts/discourse/components/date-time-input-range.js
diff --git a/app/assets/javascripts/discourse/components/date-time-input.js.es6 b/app/assets/javascripts/discourse/components/date-time-input.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/date-time-input.js.es6
rename to app/assets/javascripts/discourse/components/date-time-input.js
diff --git a/app/assets/javascripts/discourse/components/desktop-notification-config.js.es6 b/app/assets/javascripts/discourse/components/desktop-notification-config.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/desktop-notification-config.js.es6
rename to app/assets/javascripts/discourse/components/desktop-notification-config.js
diff --git a/app/assets/javascripts/discourse/components/directory-item.js.es6 b/app/assets/javascripts/discourse/components/directory-item.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/directory-item.js.es6
rename to app/assets/javascripts/discourse/components/directory-item.js
diff --git a/app/assets/javascripts/discourse/components/directory-toggle.js.es6 b/app/assets/javascripts/discourse/components/directory-toggle.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/directory-toggle.js.es6
rename to app/assets/javascripts/discourse/components/directory-toggle.js
diff --git a/app/assets/javascripts/discourse/components/disabled-icon.js.es6 b/app/assets/javascripts/discourse/components/disabled-icon.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/disabled-icon.js.es6
rename to app/assets/javascripts/discourse/components/disabled-icon.js
diff --git a/app/assets/javascripts/discourse/components/discourse-banner.js.es6 b/app/assets/javascripts/discourse/components/discourse-banner.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/discourse-banner.js.es6
rename to app/assets/javascripts/discourse/components/discourse-banner.js
diff --git a/app/assets/javascripts/discourse/components/discourse-linked-text.js.es6 b/app/assets/javascripts/discourse/components/discourse-linked-text.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/discourse-linked-text.js.es6
rename to app/assets/javascripts/discourse/components/discourse-linked-text.js
diff --git a/app/assets/javascripts/discourse/components/discourse-tag-bound.js.es6 b/app/assets/javascripts/discourse/components/discourse-tag-bound.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/discourse-tag-bound.js.es6
rename to app/assets/javascripts/discourse/components/discourse-tag-bound.js
diff --git a/app/assets/javascripts/discourse/components/discourse-topic.js.es6 b/app/assets/javascripts/discourse/components/discourse-topic.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/discourse-topic.js.es6
rename to app/assets/javascripts/discourse/components/discourse-topic.js
diff --git a/app/assets/javascripts/discourse/components/discovery-categories.js.es6 b/app/assets/javascripts/discourse/components/discovery-categories.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/discovery-categories.js.es6
rename to app/assets/javascripts/discourse/components/discovery-categories.js
diff --git a/app/assets/javascripts/discourse/components/discovery-topics-list.js.es6 b/app/assets/javascripts/discourse/components/discovery-topics-list.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/discovery-topics-list.js.es6
rename to app/assets/javascripts/discourse/components/discovery-topics-list.js
diff --git a/app/assets/javascripts/discourse/components/edit-category-general.js.es6 b/app/assets/javascripts/discourse/components/edit-category-general.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/edit-category-general.js.es6
rename to app/assets/javascripts/discourse/components/edit-category-general.js
diff --git a/app/assets/javascripts/discourse/components/edit-category-images.js.es6 b/app/assets/javascripts/discourse/components/edit-category-images.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/edit-category-images.js.es6
rename to app/assets/javascripts/discourse/components/edit-category-images.js
diff --git a/app/assets/javascripts/discourse/components/edit-category-panel.js.es6 b/app/assets/javascripts/discourse/components/edit-category-panel.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/edit-category-panel.js.es6
rename to app/assets/javascripts/discourse/components/edit-category-panel.js
diff --git a/app/assets/javascripts/discourse/components/edit-category-security.js.es6 b/app/assets/javascripts/discourse/components/edit-category-security.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/edit-category-security.js.es6
rename to app/assets/javascripts/discourse/components/edit-category-security.js
diff --git a/app/assets/javascripts/discourse/components/edit-category-settings.js.es6 b/app/assets/javascripts/discourse/components/edit-category-settings.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/edit-category-settings.js.es6
rename to app/assets/javascripts/discourse/components/edit-category-settings.js
diff --git a/app/assets/javascripts/discourse/components/edit-category-tab.js.es6 b/app/assets/javascripts/discourse/components/edit-category-tab.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/edit-category-tab.js.es6
rename to app/assets/javascripts/discourse/components/edit-category-tab.js
diff --git a/app/assets/javascripts/discourse/components/edit-category-tags.js.es6 b/app/assets/javascripts/discourse/components/edit-category-tags.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/edit-category-tags.js.es6
rename to app/assets/javascripts/discourse/components/edit-category-tags.js
diff --git a/app/assets/javascripts/discourse/components/edit-category-topic-template.js.es6 b/app/assets/javascripts/discourse/components/edit-category-topic-template.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/edit-category-topic-template.js.es6
rename to app/assets/javascripts/discourse/components/edit-category-topic-template.js
diff --git a/app/assets/javascripts/discourse/components/edit-topic-timer-form.js.es6 b/app/assets/javascripts/discourse/components/edit-topic-timer-form.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/edit-topic-timer-form.js.es6
rename to app/assets/javascripts/discourse/components/edit-topic-timer-form.js
diff --git a/app/assets/javascripts/discourse/components/emoji-picker.js.es6 b/app/assets/javascripts/discourse/components/emoji-picker.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/emoji-picker.js.es6
rename to app/assets/javascripts/discourse/components/emoji-picker.js
diff --git a/app/assets/javascripts/discourse/components/emoji-uploader.js.es6 b/app/assets/javascripts/discourse/components/emoji-uploader.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/emoji-uploader.js.es6
rename to app/assets/javascripts/discourse/components/emoji-uploader.js
diff --git a/app/assets/javascripts/discourse/components/expand-post.js.es6 b/app/assets/javascripts/discourse/components/expand-post.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/expand-post.js.es6
rename to app/assets/javascripts/discourse/components/expand-post.js
diff --git a/app/assets/javascripts/discourse/components/expanding-text-area.js.es6 b/app/assets/javascripts/discourse/components/expanding-text-area.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/expanding-text-area.js.es6
rename to app/assets/javascripts/discourse/components/expanding-text-area.js
diff --git a/app/assets/javascripts/discourse/components/featured-topic.js.es6 b/app/assets/javascripts/discourse/components/featured-topic.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/featured-topic.js.es6
rename to app/assets/javascripts/discourse/components/featured-topic.js
diff --git a/app/assets/javascripts/discourse/components/flag-action-type.js.es6 b/app/assets/javascripts/discourse/components/flag-action-type.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/flag-action-type.js.es6
rename to app/assets/javascripts/discourse/components/flag-action-type.js
diff --git a/app/assets/javascripts/discourse/components/flag-selection.js.es6 b/app/assets/javascripts/discourse/components/flag-selection.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/flag-selection.js.es6
rename to app/assets/javascripts/discourse/components/flag-selection.js
diff --git a/app/assets/javascripts/discourse/components/flat-button.js.es6 b/app/assets/javascripts/discourse/components/flat-button.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/flat-button.js.es6
rename to app/assets/javascripts/discourse/components/flat-button.js
diff --git a/app/assets/javascripts/discourse/components/footer-message.js.es6 b/app/assets/javascripts/discourse/components/footer-message.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/footer-message.js.es6
rename to app/assets/javascripts/discourse/components/footer-message.js
diff --git a/app/assets/javascripts/discourse/components/footer-nav.js.es6 b/app/assets/javascripts/discourse/components/footer-nav.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/footer-nav.js.es6
rename to app/assets/javascripts/discourse/components/footer-nav.js
diff --git a/app/assets/javascripts/discourse/components/future-date-input.js.es6 b/app/assets/javascripts/discourse/components/future-date-input.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/future-date-input.js.es6
rename to app/assets/javascripts/discourse/components/future-date-input.js
diff --git a/app/assets/javascripts/discourse/components/generated-invite-link.js.es6 b/app/assets/javascripts/discourse/components/generated-invite-link.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/generated-invite-link.js.es6
rename to app/assets/javascripts/discourse/components/generated-invite-link.js
diff --git a/app/assets/javascripts/discourse/components/global-notice.js.es6 b/app/assets/javascripts/discourse/components/global-notice.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/global-notice.js.es6
rename to app/assets/javascripts/discourse/components/global-notice.js
diff --git a/app/assets/javascripts/discourse/components/google-search.js.es6 b/app/assets/javascripts/discourse/components/google-search.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/google-search.js.es6
rename to app/assets/javascripts/discourse/components/google-search.js
diff --git a/app/assets/javascripts/discourse/components/group-activity-filter.js.es6 b/app/assets/javascripts/discourse/components/group-activity-filter.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/group-activity-filter.js.es6
rename to app/assets/javascripts/discourse/components/group-activity-filter.js
diff --git a/app/assets/javascripts/discourse/components/group-card-contents.js.es6 b/app/assets/javascripts/discourse/components/group-card-contents.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/group-card-contents.js.es6
rename to app/assets/javascripts/discourse/components/group-card-contents.js
diff --git a/app/assets/javascripts/discourse/components/group-flair-inputs.js.es6 b/app/assets/javascripts/discourse/components/group-flair-inputs.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/group-flair-inputs.js.es6
rename to app/assets/javascripts/discourse/components/group-flair-inputs.js
diff --git a/app/assets/javascripts/discourse/components/group-index-toggle.js.es6 b/app/assets/javascripts/discourse/components/group-index-toggle.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/group-index-toggle.js.es6
rename to app/assets/javascripts/discourse/components/group-index-toggle.js
diff --git a/app/assets/javascripts/discourse/components/group-manage-logs-filter.js.es6 b/app/assets/javascripts/discourse/components/group-manage-logs-filter.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/group-manage-logs-filter.js.es6
rename to app/assets/javascripts/discourse/components/group-manage-logs-filter.js
diff --git a/app/assets/javascripts/discourse/components/group-manage-logs-row.js.es6 b/app/assets/javascripts/discourse/components/group-manage-logs-row.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/group-manage-logs-row.js.es6
rename to app/assets/javascripts/discourse/components/group-manage-logs-row.js
diff --git a/app/assets/javascripts/discourse/components/group-manage-save-button.js.es6 b/app/assets/javascripts/discourse/components/group-manage-save-button.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/group-manage-save-button.js.es6
rename to app/assets/javascripts/discourse/components/group-manage-save-button.js
diff --git a/app/assets/javascripts/discourse/components/group-member-dropdown.js.es6 b/app/assets/javascripts/discourse/components/group-member-dropdown.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/group-member-dropdown.js.es6
rename to app/assets/javascripts/discourse/components/group-member-dropdown.js
diff --git a/app/assets/javascripts/discourse/components/group-member.js.es6 b/app/assets/javascripts/discourse/components/group-member.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/group-member.js.es6
rename to app/assets/javascripts/discourse/components/group-member.js
diff --git a/app/assets/javascripts/discourse/components/group-membership-button.js.es6 b/app/assets/javascripts/discourse/components/group-membership-button.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/group-membership-button.js.es6
rename to app/assets/javascripts/discourse/components/group-membership-button.js
diff --git a/app/assets/javascripts/discourse/components/group-navigation.js.es6 b/app/assets/javascripts/discourse/components/group-navigation.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/group-navigation.js.es6
rename to app/assets/javascripts/discourse/components/group-navigation.js
diff --git a/app/assets/javascripts/discourse/components/group-post.js.es6 b/app/assets/javascripts/discourse/components/group-post.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/group-post.js.es6
rename to app/assets/javascripts/discourse/components/group-post.js
diff --git a/app/assets/javascripts/discourse/components/group-selector.js.es6 b/app/assets/javascripts/discourse/components/group-selector.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/group-selector.js.es6
rename to app/assets/javascripts/discourse/components/group-selector.js
diff --git a/app/assets/javascripts/discourse/components/groups-form-interaction-fields.js.es6 b/app/assets/javascripts/discourse/components/groups-form-interaction-fields.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/groups-form-interaction-fields.js.es6
rename to app/assets/javascripts/discourse/components/groups-form-interaction-fields.js
diff --git a/app/assets/javascripts/discourse/components/groups-form-membership-fields.js.es6 b/app/assets/javascripts/discourse/components/groups-form-membership-fields.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/groups-form-membership-fields.js.es6
rename to app/assets/javascripts/discourse/components/groups-form-membership-fields.js
diff --git a/app/assets/javascripts/discourse/components/groups-form-profile-fields.js.es6 b/app/assets/javascripts/discourse/components/groups-form-profile-fields.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/groups-form-profile-fields.js.es6
rename to app/assets/javascripts/discourse/components/groups-form-profile-fields.js
diff --git a/app/assets/javascripts/discourse/components/groups-info.js.es6 b/app/assets/javascripts/discourse/components/groups-info.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/groups-info.js.es6
rename to app/assets/javascripts/discourse/components/groups-info.js
diff --git a/app/assets/javascripts/discourse/components/header-extra-info.js.es6 b/app/assets/javascripts/discourse/components/header-extra-info.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/header-extra-info.js.es6
rename to app/assets/javascripts/discourse/components/header-extra-info.js
diff --git a/app/assets/javascripts/discourse/components/hide-modal-trigger.js.es6 b/app/assets/javascripts/discourse/components/hide-modal-trigger.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/hide-modal-trigger.js.es6
rename to app/assets/javascripts/discourse/components/hide-modal-trigger.js
diff --git a/app/assets/javascripts/discourse/components/highlight-text.js.es6 b/app/assets/javascripts/discourse/components/highlight-text.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/highlight-text.js.es6
rename to app/assets/javascripts/discourse/components/highlight-text.js
diff --git a/app/assets/javascripts/discourse/components/honeypot-input.js.es6 b/app/assets/javascripts/discourse/components/honeypot-input.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/honeypot-input.js.es6
rename to app/assets/javascripts/discourse/components/honeypot-input.js
diff --git a/app/assets/javascripts/discourse/components/iframed-html.js.es6 b/app/assets/javascripts/discourse/components/iframed-html.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/iframed-html.js.es6
rename to app/assets/javascripts/discourse/components/iframed-html.js
diff --git a/app/assets/javascripts/discourse/components/ignored-user-list-item.js.es6 b/app/assets/javascripts/discourse/components/ignored-user-list-item.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/ignored-user-list-item.js.es6
rename to app/assets/javascripts/discourse/components/ignored-user-list-item.js
diff --git a/app/assets/javascripts/discourse/components/ignored-user-list.js.es6 b/app/assets/javascripts/discourse/components/ignored-user-list.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/ignored-user-list.js.es6
rename to app/assets/javascripts/discourse/components/ignored-user-list.js
diff --git a/app/assets/javascripts/discourse/components/image-uploader.js.es6 b/app/assets/javascripts/discourse/components/image-uploader.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/image-uploader.js.es6
rename to app/assets/javascripts/discourse/components/image-uploader.js
diff --git a/app/assets/javascripts/discourse/components/images-uploader.js.es6 b/app/assets/javascripts/discourse/components/images-uploader.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/images-uploader.js.es6
rename to app/assets/javascripts/discourse/components/images-uploader.js
diff --git a/app/assets/javascripts/discourse/components/input-tip.js.es6 b/app/assets/javascripts/discourse/components/input-tip.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/input-tip.js.es6
rename to app/assets/javascripts/discourse/components/input-tip.js
diff --git a/app/assets/javascripts/discourse/components/invite-panel.js.es6 b/app/assets/javascripts/discourse/components/invite-panel.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/invite-panel.js.es6
rename to app/assets/javascripts/discourse/components/invite-panel.js
diff --git a/app/assets/javascripts/discourse/components/latest-topic-list-item.js.es6 b/app/assets/javascripts/discourse/components/latest-topic-list-item.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/latest-topic-list-item.js.es6
rename to app/assets/javascripts/discourse/components/latest-topic-list-item.js
diff --git a/app/assets/javascripts/discourse/components/link-to-input.js.es6 b/app/assets/javascripts/discourse/components/link-to-input.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/link-to-input.js.es6
rename to app/assets/javascripts/discourse/components/link-to-input.js
diff --git a/app/assets/javascripts/discourse/components/links-redirect.js.es6 b/app/assets/javascripts/discourse/components/links-redirect.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/links-redirect.js.es6
rename to app/assets/javascripts/discourse/components/links-redirect.js
diff --git a/app/assets/javascripts/discourse/components/load-more.js.es6 b/app/assets/javascripts/discourse/components/load-more.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/load-more.js.es6
rename to app/assets/javascripts/discourse/components/load-more.js
diff --git a/app/assets/javascripts/discourse/components/login-buttons.js.es6 b/app/assets/javascripts/discourse/components/login-buttons.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/login-buttons.js.es6
rename to app/assets/javascripts/discourse/components/login-buttons.js
diff --git a/app/assets/javascripts/discourse/components/login-modal.js.es6 b/app/assets/javascripts/discourse/components/login-modal.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/login-modal.js.es6
rename to app/assets/javascripts/discourse/components/login-modal.js
diff --git a/app/assets/javascripts/discourse/components/login-reply-button.js.es6 b/app/assets/javascripts/discourse/components/login-reply-button.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/login-reply-button.js.es6
rename to app/assets/javascripts/discourse/components/login-reply-button.js
diff --git a/app/assets/javascripts/discourse/components/mobile-category-topic.js.es6 b/app/assets/javascripts/discourse/components/mobile-category-topic.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/mobile-category-topic.js.es6
rename to app/assets/javascripts/discourse/components/mobile-category-topic.js
diff --git a/app/assets/javascripts/discourse/components/mobile-nav.js.es6 b/app/assets/javascripts/discourse/components/mobile-nav.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/mobile-nav.js.es6
rename to app/assets/javascripts/discourse/components/mobile-nav.js
diff --git a/app/assets/javascripts/discourse/components/modal-panel.js.es6 b/app/assets/javascripts/discourse/components/modal-panel.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/modal-panel.js.es6
rename to app/assets/javascripts/discourse/components/modal-panel.js
diff --git a/app/assets/javascripts/discourse/components/modal-tab.js.es6 b/app/assets/javascripts/discourse/components/modal-tab.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/modal-tab.js.es6
rename to app/assets/javascripts/discourse/components/modal-tab.js
diff --git a/app/assets/javascripts/discourse/components/mount-widget.js.es6 b/app/assets/javascripts/discourse/components/mount-widget.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/mount-widget.js.es6
rename to app/assets/javascripts/discourse/components/mount-widget.js
diff --git a/app/assets/javascripts/discourse/components/nav-item.js.es6 b/app/assets/javascripts/discourse/components/nav-item.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/nav-item.js.es6
rename to app/assets/javascripts/discourse/components/nav-item.js
diff --git a/app/assets/javascripts/discourse/components/navigation-bar.js.es6 b/app/assets/javascripts/discourse/components/navigation-bar.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/navigation-bar.js.es6
rename to app/assets/javascripts/discourse/components/navigation-bar.js
diff --git a/app/assets/javascripts/discourse/components/navigation-item.js.es6 b/app/assets/javascripts/discourse/components/navigation-item.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/navigation-item.js.es6
rename to app/assets/javascripts/discourse/components/navigation-item.js
diff --git a/app/assets/javascripts/discourse/components/notification-consent-banner.js.es6 b/app/assets/javascripts/discourse/components/notification-consent-banner.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/notification-consent-banner.js.es6
rename to app/assets/javascripts/discourse/components/notification-consent-banner.js
diff --git a/app/assets/javascripts/discourse/components/number-field.js.es6 b/app/assets/javascripts/discourse/components/number-field.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/number-field.js.es6
rename to app/assets/javascripts/discourse/components/number-field.js
diff --git a/app/assets/javascripts/discourse/components/password-field.js.es6 b/app/assets/javascripts/discourse/components/password-field.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/password-field.js.es6
rename to app/assets/javascripts/discourse/components/password-field.js
diff --git a/app/assets/javascripts/discourse/components/plugin-connector.js.es6 b/app/assets/javascripts/discourse/components/plugin-connector.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/plugin-connector.js.es6
rename to app/assets/javascripts/discourse/components/plugin-connector.js
diff --git a/app/assets/javascripts/discourse/components/plugin-outlet.js.es6 b/app/assets/javascripts/discourse/components/plugin-outlet.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/plugin-outlet.js.es6
rename to app/assets/javascripts/discourse/components/plugin-outlet.js
diff --git a/app/assets/javascripts/discourse/components/popup-input-tip.js.es6 b/app/assets/javascripts/discourse/components/popup-input-tip.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/popup-input-tip.js.es6
rename to app/assets/javascripts/discourse/components/popup-input-tip.js
diff --git a/app/assets/javascripts/discourse/components/preference-checkbox.js.es6 b/app/assets/javascripts/discourse/components/preference-checkbox.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/preference-checkbox.js.es6
rename to app/assets/javascripts/discourse/components/preference-checkbox.js
diff --git a/app/assets/javascripts/discourse/components/private-message-glyph.js.es6 b/app/assets/javascripts/discourse/components/private-message-glyph.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/private-message-glyph.js.es6
rename to app/assets/javascripts/discourse/components/private-message-glyph.js
diff --git a/app/assets/javascripts/discourse/components/pwa-install-banner.js.es6 b/app/assets/javascripts/discourse/components/pwa-install-banner.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/pwa-install-banner.js.es6
rename to app/assets/javascripts/discourse/components/pwa-install-banner.js
diff --git a/app/assets/javascripts/discourse/components/quote-button.js.es6 b/app/assets/javascripts/discourse/components/quote-button.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/quote-button.js.es6
rename to app/assets/javascripts/discourse/components/quote-button.js
diff --git a/app/assets/javascripts/discourse/components/radio-button.js.es6 b/app/assets/javascripts/discourse/components/radio-button.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/radio-button.js.es6
rename to app/assets/javascripts/discourse/components/radio-button.js
diff --git a/app/assets/javascripts/discourse/components/related-messages.js.es6 b/app/assets/javascripts/discourse/components/related-messages.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/related-messages.js.es6
rename to app/assets/javascripts/discourse/components/related-messages.js
diff --git a/app/assets/javascripts/discourse/components/reviewable-bundled-action.js.es6 b/app/assets/javascripts/discourse/components/reviewable-bundled-action.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/reviewable-bundled-action.js.es6
rename to app/assets/javascripts/discourse/components/reviewable-bundled-action.js
diff --git a/app/assets/javascripts/discourse/components/reviewable-claimed-topic.js.es6 b/app/assets/javascripts/discourse/components/reviewable-claimed-topic.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/reviewable-claimed-topic.js.es6
rename to app/assets/javascripts/discourse/components/reviewable-claimed-topic.js
diff --git a/app/assets/javascripts/discourse/components/reviewable-conversation-post.js.es6 b/app/assets/javascripts/discourse/components/reviewable-conversation-post.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/reviewable-conversation-post.js.es6
rename to app/assets/javascripts/discourse/components/reviewable-conversation-post.js
diff --git a/app/assets/javascripts/discourse/components/reviewable-field-category.js.es6 b/app/assets/javascripts/discourse/components/reviewable-field-category.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/reviewable-field-category.js.es6
rename to app/assets/javascripts/discourse/components/reviewable-field-category.js
diff --git a/app/assets/javascripts/discourse/components/reviewable-field-tags.js.es6 b/app/assets/javascripts/discourse/components/reviewable-field-tags.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/reviewable-field-tags.js.es6
rename to app/assets/javascripts/discourse/components/reviewable-field-tags.js
diff --git a/app/assets/javascripts/discourse/components/reviewable-flagged-post.js.es6 b/app/assets/javascripts/discourse/components/reviewable-flagged-post.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/reviewable-flagged-post.js.es6
rename to app/assets/javascripts/discourse/components/reviewable-flagged-post.js
diff --git a/app/assets/javascripts/discourse/components/reviewable-histories.js.es6 b/app/assets/javascripts/discourse/components/reviewable-histories.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/reviewable-histories.js.es6
rename to app/assets/javascripts/discourse/components/reviewable-histories.js
diff --git a/app/assets/javascripts/discourse/components/reviewable-item.js.es6 b/app/assets/javascripts/discourse/components/reviewable-item.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/reviewable-item.js.es6
rename to app/assets/javascripts/discourse/components/reviewable-item.js
diff --git a/app/assets/javascripts/discourse/components/reviewable-queued-post.js.es6 b/app/assets/javascripts/discourse/components/reviewable-queued-post.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/reviewable-queued-post.js.es6
rename to app/assets/javascripts/discourse/components/reviewable-queued-post.js
diff --git a/app/assets/javascripts/discourse/components/reviewable-user.js.es6 b/app/assets/javascripts/discourse/components/reviewable-user.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/reviewable-user.js.es6
rename to app/assets/javascripts/discourse/components/reviewable-user.js
diff --git a/app/assets/javascripts/discourse/components/save-controls.js.es6 b/app/assets/javascripts/discourse/components/save-controls.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/save-controls.js.es6
rename to app/assets/javascripts/discourse/components/save-controls.js
diff --git a/app/assets/javascripts/discourse/components/scroll-tracker.js.es6 b/app/assets/javascripts/discourse/components/scroll-tracker.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/scroll-tracker.js.es6
rename to app/assets/javascripts/discourse/components/scroll-tracker.js
diff --git a/app/assets/javascripts/discourse/components/scrolling-post-stream.js.es6 b/app/assets/javascripts/discourse/components/scrolling-post-stream.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/scrolling-post-stream.js.es6
rename to app/assets/javascripts/discourse/components/scrolling-post-stream.js
diff --git a/app/assets/javascripts/discourse/components/search-advanced-options.js.es6 b/app/assets/javascripts/discourse/components/search-advanced-options.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/search-advanced-options.js.es6
rename to app/assets/javascripts/discourse/components/search-advanced-options.js
diff --git a/app/assets/javascripts/discourse/components/search-text-field.js.es6 b/app/assets/javascripts/discourse/components/search-text-field.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/search-text-field.js.es6
rename to app/assets/javascripts/discourse/components/search-text-field.js
diff --git a/app/assets/javascripts/discourse/components/second-factor-form.js.es6 b/app/assets/javascripts/discourse/components/second-factor-form.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/second-factor-form.js.es6
rename to app/assets/javascripts/discourse/components/second-factor-form.js
diff --git a/app/assets/javascripts/discourse/components/second-factor-input.js.es6 b/app/assets/javascripts/discourse/components/second-factor-input.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/second-factor-input.js.es6
rename to app/assets/javascripts/discourse/components/second-factor-input.js
diff --git a/app/assets/javascripts/discourse/components/security-key-form.js.es6 b/app/assets/javascripts/discourse/components/security-key-form.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/security-key-form.js.es6
rename to app/assets/javascripts/discourse/components/security-key-form.js
diff --git a/app/assets/javascripts/discourse/components/share-panel.js.es6 b/app/assets/javascripts/discourse/components/share-panel.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/share-panel.js.es6
rename to app/assets/javascripts/discourse/components/share-panel.js
diff --git a/app/assets/javascripts/discourse/components/share-popup.js.es6 b/app/assets/javascripts/discourse/components/share-popup.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/share-popup.js.es6
rename to app/assets/javascripts/discourse/components/share-popup.js
diff --git a/app/assets/javascripts/discourse/components/share-source.js.es6 b/app/assets/javascripts/discourse/components/share-source.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/share-source.js.es6
rename to app/assets/javascripts/discourse/components/share-source.js
diff --git a/app/assets/javascripts/discourse/components/shared-draft-controls.js.es6 b/app/assets/javascripts/discourse/components/shared-draft-controls.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/shared-draft-controls.js.es6
rename to app/assets/javascripts/discourse/components/shared-draft-controls.js
diff --git a/app/assets/javascripts/discourse/components/signup-cta.js.es6 b/app/assets/javascripts/discourse/components/signup-cta.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/signup-cta.js.es6
rename to app/assets/javascripts/discourse/components/signup-cta.js
diff --git a/app/assets/javascripts/discourse/components/site-header.js.es6 b/app/assets/javascripts/discourse/components/site-header.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/site-header.js.es6
rename to app/assets/javascripts/discourse/components/site-header.js
diff --git a/app/assets/javascripts/discourse/components/suggested-topics.js.es6 b/app/assets/javascripts/discourse/components/suggested-topics.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/suggested-topics.js.es6
rename to app/assets/javascripts/discourse/components/suggested-topics.js
diff --git a/app/assets/javascripts/discourse/components/tag-drop-link.js.es6 b/app/assets/javascripts/discourse/components/tag-drop-link.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/tag-drop-link.js.es6
rename to app/assets/javascripts/discourse/components/tag-drop-link.js
diff --git a/app/assets/javascripts/discourse/components/tag-groups-form.js.es6 b/app/assets/javascripts/discourse/components/tag-groups-form.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/tag-groups-form.js.es6
rename to app/assets/javascripts/discourse/components/tag-groups-form.js
diff --git a/app/assets/javascripts/discourse/components/tag-info.js.es6 b/app/assets/javascripts/discourse/components/tag-info.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/tag-info.js.es6
rename to app/assets/javascripts/discourse/components/tag-info.js
diff --git a/app/assets/javascripts/discourse/components/tag-list.js.es6 b/app/assets/javascripts/discourse/components/tag-list.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/tag-list.js.es6
rename to app/assets/javascripts/discourse/components/tag-list.js
diff --git a/app/assets/javascripts/discourse/components/tags-admin-dropdown.js.es6 b/app/assets/javascripts/discourse/components/tags-admin-dropdown.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/tags-admin-dropdown.js.es6
rename to app/assets/javascripts/discourse/components/tags-admin-dropdown.js
diff --git a/app/assets/javascripts/discourse/components/tap-tile-grid.js.es6 b/app/assets/javascripts/discourse/components/tap-tile-grid.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/tap-tile-grid.js.es6
rename to app/assets/javascripts/discourse/components/tap-tile-grid.js
diff --git a/app/assets/javascripts/discourse/components/tap-tile.js.es6 b/app/assets/javascripts/discourse/components/tap-tile.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/tap-tile.js.es6
rename to app/assets/javascripts/discourse/components/tap-tile.js
diff --git a/app/assets/javascripts/discourse/components/text-field.js.es6 b/app/assets/javascripts/discourse/components/text-field.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/text-field.js.es6
rename to app/assets/javascripts/discourse/components/text-field.js
diff --git a/app/assets/javascripts/discourse/components/text-overflow.js.es6 b/app/assets/javascripts/discourse/components/text-overflow.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/text-overflow.js.es6
rename to app/assets/javascripts/discourse/components/text-overflow.js
diff --git a/app/assets/javascripts/discourse/components/time-input.js.es6 b/app/assets/javascripts/discourse/components/time-input.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/time-input.js.es6
rename to app/assets/javascripts/discourse/components/time-input.js
diff --git a/app/assets/javascripts/discourse/components/top-period-buttons.js.es6 b/app/assets/javascripts/discourse/components/top-period-buttons.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/top-period-buttons.js.es6
rename to app/assets/javascripts/discourse/components/top-period-buttons.js
diff --git a/app/assets/javascripts/discourse/components/topic-admin-menu-button.js.es6 b/app/assets/javascripts/discourse/components/topic-admin-menu-button.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/topic-admin-menu-button.js.es6
rename to app/assets/javascripts/discourse/components/topic-admin-menu-button.js
diff --git a/app/assets/javascripts/discourse/components/topic-category.js.es6 b/app/assets/javascripts/discourse/components/topic-category.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/topic-category.js.es6
rename to app/assets/javascripts/discourse/components/topic-category.js
diff --git a/app/assets/javascripts/discourse/components/topic-entrance.js.es6 b/app/assets/javascripts/discourse/components/topic-entrance.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/topic-entrance.js.es6
rename to app/assets/javascripts/discourse/components/topic-entrance.js
diff --git a/app/assets/javascripts/discourse/components/topic-footer-buttons.js.es6 b/app/assets/javascripts/discourse/components/topic-footer-buttons.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/topic-footer-buttons.js.es6
rename to app/assets/javascripts/discourse/components/topic-footer-buttons.js
diff --git a/app/assets/javascripts/discourse/components/topic-join-group-notice.js.es6 b/app/assets/javascripts/discourse/components/topic-join-group-notice.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/topic-join-group-notice.js.es6
rename to app/assets/javascripts/discourse/components/topic-join-group-notice.js
diff --git a/app/assets/javascripts/discourse/components/topic-list-item.js.es6 b/app/assets/javascripts/discourse/components/topic-list-item.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/topic-list-item.js.es6
rename to app/assets/javascripts/discourse/components/topic-list-item.js
diff --git a/app/assets/javascripts/discourse/components/topic-list.js.es6 b/app/assets/javascripts/discourse/components/topic-list.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/topic-list.js.es6
rename to app/assets/javascripts/discourse/components/topic-list.js
diff --git a/app/assets/javascripts/discourse/components/topic-navigation.js.es6 b/app/assets/javascripts/discourse/components/topic-navigation.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/topic-navigation.js.es6
rename to app/assets/javascripts/discourse/components/topic-navigation.js
diff --git a/app/assets/javascripts/discourse/components/topic-post-badges.js.es6 b/app/assets/javascripts/discourse/components/topic-post-badges.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/topic-post-badges.js.es6
rename to app/assets/javascripts/discourse/components/topic-post-badges.js
diff --git a/app/assets/javascripts/discourse/components/topic-progress.js.es6 b/app/assets/javascripts/discourse/components/topic-progress.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/topic-progress.js.es6
rename to app/assets/javascripts/discourse/components/topic-progress.js
diff --git a/app/assets/javascripts/discourse/components/topic-status.js.es6 b/app/assets/javascripts/discourse/components/topic-status.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/topic-status.js.es6
rename to app/assets/javascripts/discourse/components/topic-status.js
diff --git a/app/assets/javascripts/discourse/components/topic-timeline.js.es6 b/app/assets/javascripts/discourse/components/topic-timeline.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/topic-timeline.js.es6
rename to app/assets/javascripts/discourse/components/topic-timeline.js
diff --git a/app/assets/javascripts/discourse/components/topic-timer-info.js.es6 b/app/assets/javascripts/discourse/components/topic-timer-info.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/topic-timer-info.js.es6
rename to app/assets/javascripts/discourse/components/topic-timer-info.js
diff --git a/app/assets/javascripts/discourse/components/topic-title.js.es6 b/app/assets/javascripts/discourse/components/topic-title.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/topic-title.js.es6
rename to app/assets/javascripts/discourse/components/topic-title.js
diff --git a/app/assets/javascripts/discourse/components/track-selected.js.es6 b/app/assets/javascripts/discourse/components/track-selected.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/track-selected.js.es6
rename to app/assets/javascripts/discourse/components/track-selected.js
diff --git a/app/assets/javascripts/discourse/components/user-badge.js.es6 b/app/assets/javascripts/discourse/components/user-badge.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/user-badge.js.es6
rename to app/assets/javascripts/discourse/components/user-badge.js
diff --git a/app/assets/javascripts/discourse/components/user-card-contents.js.es6 b/app/assets/javascripts/discourse/components/user-card-contents.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/user-card-contents.js.es6
rename to app/assets/javascripts/discourse/components/user-card-contents.js
diff --git a/app/assets/javascripts/discourse/components/user-field.js.es6 b/app/assets/javascripts/discourse/components/user-field.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/user-field.js.es6
rename to app/assets/javascripts/discourse/components/user-field.js
diff --git a/app/assets/javascripts/discourse/components/user-flag-percentage.js.es6 b/app/assets/javascripts/discourse/components/user-flag-percentage.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/user-flag-percentage.js.es6
rename to app/assets/javascripts/discourse/components/user-flag-percentage.js
diff --git a/app/assets/javascripts/discourse/components/user-info.js.es6 b/app/assets/javascripts/discourse/components/user-info.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/user-info.js.es6
rename to app/assets/javascripts/discourse/components/user-info.js
diff --git a/app/assets/javascripts/discourse/components/user-link.js.es6 b/app/assets/javascripts/discourse/components/user-link.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/user-link.js.es6
rename to app/assets/javascripts/discourse/components/user-link.js
diff --git a/app/assets/javascripts/discourse/components/user-notifications-large.js.es6 b/app/assets/javascripts/discourse/components/user-notifications-large.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/user-notifications-large.js.es6
rename to app/assets/javascripts/discourse/components/user-notifications-large.js
diff --git a/app/assets/javascripts/discourse/components/user-selector.js.es6 b/app/assets/javascripts/discourse/components/user-selector.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/user-selector.js.es6
rename to app/assets/javascripts/discourse/components/user-selector.js
diff --git a/app/assets/javascripts/discourse/components/user-stat.js.es6 b/app/assets/javascripts/discourse/components/user-stat.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/user-stat.js.es6
rename to app/assets/javascripts/discourse/components/user-stat.js
diff --git a/app/assets/javascripts/discourse/components/user-stream-item.js.es6 b/app/assets/javascripts/discourse/components/user-stream-item.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/user-stream-item.js.es6
rename to app/assets/javascripts/discourse/components/user-stream-item.js
diff --git a/app/assets/javascripts/discourse/components/user-stream.js.es6 b/app/assets/javascripts/discourse/components/user-stream.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/user-stream.js.es6
rename to app/assets/javascripts/discourse/components/user-stream.js
diff --git a/app/assets/javascripts/discourse/components/user-summary-category-search.js.es6 b/app/assets/javascripts/discourse/components/user-summary-category-search.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/user-summary-category-search.js.es6
rename to app/assets/javascripts/discourse/components/user-summary-category-search.js
diff --git a/app/assets/javascripts/discourse/components/user-summary-section.js.es6 b/app/assets/javascripts/discourse/components/user-summary-section.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/user-summary-section.js.es6
rename to app/assets/javascripts/discourse/components/user-summary-section.js
diff --git a/app/assets/javascripts/discourse/components/user-summary-topic.js.es6 b/app/assets/javascripts/discourse/components/user-summary-topic.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/user-summary-topic.js.es6
rename to app/assets/javascripts/discourse/components/user-summary-topic.js
diff --git a/app/assets/javascripts/discourse/components/user-summary-topics-list.js.es6 b/app/assets/javascripts/discourse/components/user-summary-topics-list.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/user-summary-topics-list.js.es6
rename to app/assets/javascripts/discourse/components/user-summary-topics-list.js
diff --git a/app/assets/javascripts/discourse/components/user-summary-user.js.es6 b/app/assets/javascripts/discourse/components/user-summary-user.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/user-summary-user.js.es6
rename to app/assets/javascripts/discourse/components/user-summary-user.js
diff --git a/app/assets/javascripts/discourse/components/watch-read.js.es6 b/app/assets/javascripts/discourse/components/watch-read.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/watch-read.js.es6
rename to app/assets/javascripts/discourse/components/watch-read.js
diff --git a/app/assets/javascripts/discourse/controllers/about.js.es6 b/app/assets/javascripts/discourse/controllers/about.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/about.js.es6
rename to app/assets/javascripts/discourse/controllers/about.js
diff --git a/app/assets/javascripts/discourse/controllers/account-created-edit-email.js.es6 b/app/assets/javascripts/discourse/controllers/account-created-edit-email.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/account-created-edit-email.js.es6
rename to app/assets/javascripts/discourse/controllers/account-created-edit-email.js
diff --git a/app/assets/javascripts/discourse/controllers/account-created-index.js.es6 b/app/assets/javascripts/discourse/controllers/account-created-index.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/account-created-index.js.es6
rename to app/assets/javascripts/discourse/controllers/account-created-index.js
diff --git a/app/assets/javascripts/discourse/controllers/activation-edit.js.es6 b/app/assets/javascripts/discourse/controllers/activation-edit.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/activation-edit.js.es6
rename to app/assets/javascripts/discourse/controllers/activation-edit.js
diff --git a/app/assets/javascripts/discourse/controllers/add-post-notice.js.es6 b/app/assets/javascripts/discourse/controllers/add-post-notice.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/add-post-notice.js.es6
rename to app/assets/javascripts/discourse/controllers/add-post-notice.js
diff --git a/app/assets/javascripts/discourse/controllers/application.js.es6 b/app/assets/javascripts/discourse/controllers/application.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/application.js.es6
rename to app/assets/javascripts/discourse/controllers/application.js
diff --git a/app/assets/javascripts/discourse/controllers/associate-account-confirm.js.es6 b/app/assets/javascripts/discourse/controllers/associate-account-confirm.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/associate-account-confirm.js.es6
rename to app/assets/javascripts/discourse/controllers/associate-account-confirm.js
diff --git a/app/assets/javascripts/discourse/controllers/auth-token.js.es6 b/app/assets/javascripts/discourse/controllers/auth-token.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/auth-token.js.es6
rename to app/assets/javascripts/discourse/controllers/auth-token.js
diff --git a/app/assets/javascripts/discourse/controllers/avatar-selector.js.es6 b/app/assets/javascripts/discourse/controllers/avatar-selector.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/avatar-selector.js.es6
rename to app/assets/javascripts/discourse/controllers/avatar-selector.js
diff --git a/app/assets/javascripts/discourse/controllers/badges/index.js.es6 b/app/assets/javascripts/discourse/controllers/badges/index.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/badges/index.js.es6
rename to app/assets/javascripts/discourse/controllers/badges/index.js
diff --git a/app/assets/javascripts/discourse/controllers/badges/show.js.es6 b/app/assets/javascripts/discourse/controllers/badges/show.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/badges/show.js.es6
rename to app/assets/javascripts/discourse/controllers/badges/show.js
diff --git a/app/assets/javascripts/discourse/controllers/basic-modal-body.js.es6 b/app/assets/javascripts/discourse/controllers/basic-modal-body.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/basic-modal-body.js.es6
rename to app/assets/javascripts/discourse/controllers/basic-modal-body.js
diff --git a/app/assets/javascripts/discourse/controllers/bookmark.js.es6 b/app/assets/javascripts/discourse/controllers/bookmark.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/bookmark.js.es6
rename to app/assets/javascripts/discourse/controllers/bookmark.js
diff --git a/app/assets/javascripts/discourse/controllers/bulk-notification-level.js.es6 b/app/assets/javascripts/discourse/controllers/bulk-notification-level.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/bulk-notification-level.js.es6
rename to app/assets/javascripts/discourse/controllers/bulk-notification-level.js
diff --git a/app/assets/javascripts/discourse/controllers/change-owner.js.es6 b/app/assets/javascripts/discourse/controllers/change-owner.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/change-owner.js.es6
rename to app/assets/javascripts/discourse/controllers/change-owner.js
diff --git a/app/assets/javascripts/discourse/controllers/change-timestamp.js.es6 b/app/assets/javascripts/discourse/controllers/change-timestamp.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/change-timestamp.js.es6
rename to app/assets/javascripts/discourse/controllers/change-timestamp.js
diff --git a/app/assets/javascripts/discourse/controllers/composer.js.es6 b/app/assets/javascripts/discourse/controllers/composer.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/composer.js.es6
rename to app/assets/javascripts/discourse/controllers/composer.js
diff --git a/app/assets/javascripts/discourse/controllers/convert-to-public-topic.js.es6 b/app/assets/javascripts/discourse/controllers/convert-to-public-topic.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/convert-to-public-topic.js.es6
rename to app/assets/javascripts/discourse/controllers/convert-to-public-topic.js
diff --git a/app/assets/javascripts/discourse/controllers/create-account.js.es6 b/app/assets/javascripts/discourse/controllers/create-account.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/create-account.js.es6
rename to app/assets/javascripts/discourse/controllers/create-account.js
diff --git a/app/assets/javascripts/discourse/controllers/discovery-sortable.js.es6 b/app/assets/javascripts/discourse/controllers/discovery-sortable.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/discovery-sortable.js.es6
rename to app/assets/javascripts/discourse/controllers/discovery-sortable.js
diff --git a/app/assets/javascripts/discourse/controllers/discovery.js.es6 b/app/assets/javascripts/discourse/controllers/discovery.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/discovery.js.es6
rename to app/assets/javascripts/discourse/controllers/discovery.js
diff --git a/app/assets/javascripts/discourse/controllers/discovery/categories.js.es6 b/app/assets/javascripts/discourse/controllers/discovery/categories.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/discovery/categories.js.es6
rename to app/assets/javascripts/discourse/controllers/discovery/categories.js
diff --git a/app/assets/javascripts/discourse/controllers/discovery/topics.js.es6 b/app/assets/javascripts/discourse/controllers/discovery/topics.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/discovery/topics.js.es6
rename to app/assets/javascripts/discourse/controllers/discovery/topics.js
diff --git a/app/assets/javascripts/discourse/controllers/edit-category.js.es6 b/app/assets/javascripts/discourse/controllers/edit-category.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/edit-category.js.es6
rename to app/assets/javascripts/discourse/controllers/edit-category.js
diff --git a/app/assets/javascripts/discourse/controllers/edit-topic-timer.js.es6 b/app/assets/javascripts/discourse/controllers/edit-topic-timer.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/edit-topic-timer.js.es6
rename to app/assets/javascripts/discourse/controllers/edit-topic-timer.js
diff --git a/app/assets/javascripts/discourse/controllers/email-login.js.es6 b/app/assets/javascripts/discourse/controllers/email-login.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/email-login.js.es6
rename to app/assets/javascripts/discourse/controllers/email-login.js
diff --git a/app/assets/javascripts/discourse/controllers/exception.js.es6 b/app/assets/javascripts/discourse/controllers/exception.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/exception.js.es6
rename to app/assets/javascripts/discourse/controllers/exception.js
diff --git a/app/assets/javascripts/discourse/controllers/explain-reviewable.js.es6 b/app/assets/javascripts/discourse/controllers/explain-reviewable.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/explain-reviewable.js.es6
rename to app/assets/javascripts/discourse/controllers/explain-reviewable.js
diff --git a/app/assets/javascripts/discourse/controllers/feature-topic-on-profile.js.es6 b/app/assets/javascripts/discourse/controllers/feature-topic-on-profile.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/feature-topic-on-profile.js.es6
rename to app/assets/javascripts/discourse/controllers/feature-topic-on-profile.js
diff --git a/app/assets/javascripts/discourse/controllers/feature-topic.js.es6 b/app/assets/javascripts/discourse/controllers/feature-topic.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/feature-topic.js.es6
rename to app/assets/javascripts/discourse/controllers/feature-topic.js
diff --git a/app/assets/javascripts/discourse/controllers/flag.js.es6 b/app/assets/javascripts/discourse/controllers/flag.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/flag.js.es6
rename to app/assets/javascripts/discourse/controllers/flag.js
diff --git a/app/assets/javascripts/discourse/controllers/forgot-password.js.es6 b/app/assets/javascripts/discourse/controllers/forgot-password.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/forgot-password.js.es6
rename to app/assets/javascripts/discourse/controllers/forgot-password.js
diff --git a/app/assets/javascripts/discourse/controllers/full-page-search.js.es6 b/app/assets/javascripts/discourse/controllers/full-page-search.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/full-page-search.js.es6
rename to app/assets/javascripts/discourse/controllers/full-page-search.js
diff --git a/app/assets/javascripts/discourse/controllers/grant-badge.js.es6 b/app/assets/javascripts/discourse/controllers/grant-badge.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/grant-badge.js.es6
rename to app/assets/javascripts/discourse/controllers/grant-badge.js
diff --git a/app/assets/javascripts/discourse/controllers/group-activity-posts.js.es6 b/app/assets/javascripts/discourse/controllers/group-activity-posts.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/group-activity-posts.js.es6
rename to app/assets/javascripts/discourse/controllers/group-activity-posts.js
diff --git a/app/assets/javascripts/discourse/controllers/group-activity-topics.js.es6 b/app/assets/javascripts/discourse/controllers/group-activity-topics.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/group-activity-topics.js.es6
rename to app/assets/javascripts/discourse/controllers/group-activity-topics.js
diff --git a/app/assets/javascripts/discourse/controllers/group-activity.js.es6 b/app/assets/javascripts/discourse/controllers/group-activity.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/group-activity.js.es6
rename to app/assets/javascripts/discourse/controllers/group-activity.js
diff --git a/app/assets/javascripts/discourse/controllers/group-add-members.js.es6 b/app/assets/javascripts/discourse/controllers/group-add-members.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/group-add-members.js.es6
rename to app/assets/javascripts/discourse/controllers/group-add-members.js
diff --git a/app/assets/javascripts/discourse/controllers/group-bulk-add.js.es6 b/app/assets/javascripts/discourse/controllers/group-bulk-add.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/group-bulk-add.js.es6
rename to app/assets/javascripts/discourse/controllers/group-bulk-add.js
diff --git a/app/assets/javascripts/discourse/controllers/group-index.js.es6 b/app/assets/javascripts/discourse/controllers/group-index.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/group-index.js.es6
rename to app/assets/javascripts/discourse/controllers/group-index.js
diff --git a/app/assets/javascripts/discourse/controllers/group-manage-logs.js.es6 b/app/assets/javascripts/discourse/controllers/group-manage-logs.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/group-manage-logs.js.es6
rename to app/assets/javascripts/discourse/controllers/group-manage-logs.js
diff --git a/app/assets/javascripts/discourse/controllers/group-manage-profile.js.es6 b/app/assets/javascripts/discourse/controllers/group-manage-profile.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/group-manage-profile.js.es6
rename to app/assets/javascripts/discourse/controllers/group-manage-profile.js
diff --git a/app/assets/javascripts/discourse/controllers/group-manage.js.es6 b/app/assets/javascripts/discourse/controllers/group-manage.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/group-manage.js.es6
rename to app/assets/javascripts/discourse/controllers/group-manage.js
diff --git a/app/assets/javascripts/discourse/controllers/group-messages.js.es6 b/app/assets/javascripts/discourse/controllers/group-messages.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/group-messages.js.es6
rename to app/assets/javascripts/discourse/controllers/group-messages.js
diff --git a/app/assets/javascripts/discourse/controllers/group-requests.js.es6 b/app/assets/javascripts/discourse/controllers/group-requests.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/group-requests.js.es6
rename to app/assets/javascripts/discourse/controllers/group-requests.js
diff --git a/app/assets/javascripts/discourse/controllers/group.js.es6 b/app/assets/javascripts/discourse/controllers/group.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/group.js.es6
rename to app/assets/javascripts/discourse/controllers/group.js
diff --git a/app/assets/javascripts/discourse/controllers/groups-index.js.es6 b/app/assets/javascripts/discourse/controllers/groups-index.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/groups-index.js.es6
rename to app/assets/javascripts/discourse/controllers/groups-index.js
diff --git a/app/assets/javascripts/discourse/controllers/groups-new.js.es6 b/app/assets/javascripts/discourse/controllers/groups-new.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/groups-new.js.es6
rename to app/assets/javascripts/discourse/controllers/groups-new.js
diff --git a/app/assets/javascripts/discourse/controllers/history.js.es6 b/app/assets/javascripts/discourse/controllers/history.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/history.js.es6
rename to app/assets/javascripts/discourse/controllers/history.js
diff --git a/app/assets/javascripts/discourse/controllers/ignore-duration-with-username.js.es6 b/app/assets/javascripts/discourse/controllers/ignore-duration-with-username.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/ignore-duration-with-username.js.es6
rename to app/assets/javascripts/discourse/controllers/ignore-duration-with-username.js
diff --git a/app/assets/javascripts/discourse/controllers/ignore-duration.js.es6 b/app/assets/javascripts/discourse/controllers/ignore-duration.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/ignore-duration.js.es6
rename to app/assets/javascripts/discourse/controllers/ignore-duration.js
diff --git a/app/assets/javascripts/discourse/controllers/insert-hyperlink.js.es6 b/app/assets/javascripts/discourse/controllers/insert-hyperlink.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/insert-hyperlink.js.es6
rename to app/assets/javascripts/discourse/controllers/insert-hyperlink.js
diff --git a/app/assets/javascripts/discourse/controllers/invites-show.js.es6 b/app/assets/javascripts/discourse/controllers/invites-show.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/invites-show.js.es6
rename to app/assets/javascripts/discourse/controllers/invites-show.js
diff --git a/app/assets/javascripts/discourse/controllers/jump-to-post.js.es6 b/app/assets/javascripts/discourse/controllers/jump-to-post.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/jump-to-post.js.es6
rename to app/assets/javascripts/discourse/controllers/jump-to-post.js
diff --git a/app/assets/javascripts/discourse/controllers/keyboard-shortcuts-help.js.es6 b/app/assets/javascripts/discourse/controllers/keyboard-shortcuts-help.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/keyboard-shortcuts-help.js.es6
rename to app/assets/javascripts/discourse/controllers/keyboard-shortcuts-help.js
diff --git a/app/assets/javascripts/discourse/controllers/login.js.es6 b/app/assets/javascripts/discourse/controllers/login.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/login.js.es6
rename to app/assets/javascripts/discourse/controllers/login.js
diff --git a/app/assets/javascripts/discourse/controllers/modal.js.es6 b/app/assets/javascripts/discourse/controllers/modal.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/modal.js.es6
rename to app/assets/javascripts/discourse/controllers/modal.js
diff --git a/app/assets/javascripts/discourse/controllers/move-to-topic.js.es6 b/app/assets/javascripts/discourse/controllers/move-to-topic.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/move-to-topic.js.es6
rename to app/assets/javascripts/discourse/controllers/move-to-topic.js
diff --git a/app/assets/javascripts/discourse/controllers/navigation/categories.js.es6 b/app/assets/javascripts/discourse/controllers/navigation/categories.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/navigation/categories.js.es6
rename to app/assets/javascripts/discourse/controllers/navigation/categories.js
diff --git a/app/assets/javascripts/discourse/controllers/navigation/category.js.es6 b/app/assets/javascripts/discourse/controllers/navigation/category.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/navigation/category.js.es6
rename to app/assets/javascripts/discourse/controllers/navigation/category.js
diff --git a/app/assets/javascripts/discourse/controllers/navigation/default.js.es6 b/app/assets/javascripts/discourse/controllers/navigation/default.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/navigation/default.js.es6
rename to app/assets/javascripts/discourse/controllers/navigation/default.js
diff --git a/app/assets/javascripts/discourse/controllers/not-activated.js.es6 b/app/assets/javascripts/discourse/controllers/not-activated.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/not-activated.js.es6
rename to app/assets/javascripts/discourse/controllers/not-activated.js
diff --git a/app/assets/javascripts/discourse/controllers/password-reset.js.es6 b/app/assets/javascripts/discourse/controllers/password-reset.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/password-reset.js.es6
rename to app/assets/javascripts/discourse/controllers/password-reset.js
diff --git a/app/assets/javascripts/discourse/controllers/preferences.js.es6 b/app/assets/javascripts/discourse/controllers/preferences.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/preferences.js.es6
rename to app/assets/javascripts/discourse/controllers/preferences.js
diff --git a/app/assets/javascripts/discourse/controllers/preferences/account.js.es6 b/app/assets/javascripts/discourse/controllers/preferences/account.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/preferences/account.js.es6
rename to app/assets/javascripts/discourse/controllers/preferences/account.js
diff --git a/app/assets/javascripts/discourse/controllers/preferences/categories.js.es6 b/app/assets/javascripts/discourse/controllers/preferences/categories.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/preferences/categories.js.es6
rename to app/assets/javascripts/discourse/controllers/preferences/categories.js
diff --git a/app/assets/javascripts/discourse/controllers/preferences/email.js.es6 b/app/assets/javascripts/discourse/controllers/preferences/email.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/preferences/email.js.es6
rename to app/assets/javascripts/discourse/controllers/preferences/email.js
diff --git a/app/assets/javascripts/discourse/controllers/preferences/emails.js.es6 b/app/assets/javascripts/discourse/controllers/preferences/emails.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/preferences/emails.js.es6
rename to app/assets/javascripts/discourse/controllers/preferences/emails.js
diff --git a/app/assets/javascripts/discourse/controllers/preferences/interface.js.es6 b/app/assets/javascripts/discourse/controllers/preferences/interface.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/preferences/interface.js.es6
rename to app/assets/javascripts/discourse/controllers/preferences/interface.js
diff --git a/app/assets/javascripts/discourse/controllers/preferences/notifications.js.es6 b/app/assets/javascripts/discourse/controllers/preferences/notifications.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/preferences/notifications.js.es6
rename to app/assets/javascripts/discourse/controllers/preferences/notifications.js
diff --git a/app/assets/javascripts/discourse/controllers/preferences/profile.js.es6 b/app/assets/javascripts/discourse/controllers/preferences/profile.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/preferences/profile.js.es6
rename to app/assets/javascripts/discourse/controllers/preferences/profile.js
diff --git a/app/assets/javascripts/discourse/controllers/preferences/second-factor.js.es6 b/app/assets/javascripts/discourse/controllers/preferences/second-factor.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/preferences/second-factor.js.es6
rename to app/assets/javascripts/discourse/controllers/preferences/second-factor.js
diff --git a/app/assets/javascripts/discourse/controllers/preferences/tags.js.es6 b/app/assets/javascripts/discourse/controllers/preferences/tags.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/preferences/tags.js.es6
rename to app/assets/javascripts/discourse/controllers/preferences/tags.js
diff --git a/app/assets/javascripts/discourse/controllers/preferences/username.js.es6 b/app/assets/javascripts/discourse/controllers/preferences/username.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/preferences/username.js.es6
rename to app/assets/javascripts/discourse/controllers/preferences/username.js
diff --git a/app/assets/javascripts/discourse/controllers/preferences/users.js.es6 b/app/assets/javascripts/discourse/controllers/preferences/users.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/preferences/users.js.es6
rename to app/assets/javascripts/discourse/controllers/preferences/users.js
diff --git a/app/assets/javascripts/discourse/controllers/raw-email.js.es6 b/app/assets/javascripts/discourse/controllers/raw-email.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/raw-email.js.es6
rename to app/assets/javascripts/discourse/controllers/raw-email.js
diff --git a/app/assets/javascripts/discourse/controllers/rename-tag.js.es6 b/app/assets/javascripts/discourse/controllers/rename-tag.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/rename-tag.js.es6
rename to app/assets/javascripts/discourse/controllers/rename-tag.js
diff --git a/app/assets/javascripts/discourse/controllers/reorder-categories.js.es6 b/app/assets/javascripts/discourse/controllers/reorder-categories.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/reorder-categories.js.es6
rename to app/assets/javascripts/discourse/controllers/reorder-categories.js
diff --git a/app/assets/javascripts/discourse/controllers/request-group-membership-form.js.es6 b/app/assets/javascripts/discourse/controllers/request-group-membership-form.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/request-group-membership-form.js.es6
rename to app/assets/javascripts/discourse/controllers/request-group-membership-form.js
diff --git a/app/assets/javascripts/discourse/controllers/review-index.js.es6 b/app/assets/javascripts/discourse/controllers/review-index.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/review-index.js.es6
rename to app/assets/javascripts/discourse/controllers/review-index.js
diff --git a/app/assets/javascripts/discourse/controllers/review-settings.js.es6 b/app/assets/javascripts/discourse/controllers/review-settings.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/review-settings.js.es6
rename to app/assets/javascripts/discourse/controllers/review-settings.js
diff --git a/app/assets/javascripts/discourse/controllers/second-factor-add-security-key.js.es6 b/app/assets/javascripts/discourse/controllers/second-factor-add-security-key.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/second-factor-add-security-key.js.es6
rename to app/assets/javascripts/discourse/controllers/second-factor-add-security-key.js
diff --git a/app/assets/javascripts/discourse/controllers/second-factor-add-totp.js.es6 b/app/assets/javascripts/discourse/controllers/second-factor-add-totp.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/second-factor-add-totp.js.es6
rename to app/assets/javascripts/discourse/controllers/second-factor-add-totp.js
diff --git a/app/assets/javascripts/discourse/controllers/second-factor-backup-edit.js.es6 b/app/assets/javascripts/discourse/controllers/second-factor-backup-edit.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/second-factor-backup-edit.js.es6
rename to app/assets/javascripts/discourse/controllers/second-factor-backup-edit.js
diff --git a/app/assets/javascripts/discourse/controllers/second-factor-edit-security-key.js.es6 b/app/assets/javascripts/discourse/controllers/second-factor-edit-security-key.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/second-factor-edit-security-key.js.es6
rename to app/assets/javascripts/discourse/controllers/second-factor-edit-security-key.js
diff --git a/app/assets/javascripts/discourse/controllers/second-factor-edit.js.es6 b/app/assets/javascripts/discourse/controllers/second-factor-edit.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/second-factor-edit.js.es6
rename to app/assets/javascripts/discourse/controllers/second-factor-edit.js
diff --git a/app/assets/javascripts/discourse/controllers/static.js.es6 b/app/assets/javascripts/discourse/controllers/static.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/static.js.es6
rename to app/assets/javascripts/discourse/controllers/static.js
diff --git a/app/assets/javascripts/discourse/controllers/tag-groups-edit.js.es6 b/app/assets/javascripts/discourse/controllers/tag-groups-edit.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/tag-groups-edit.js.es6
rename to app/assets/javascripts/discourse/controllers/tag-groups-edit.js
diff --git a/app/assets/javascripts/discourse/controllers/tag-groups-new.js.es6 b/app/assets/javascripts/discourse/controllers/tag-groups-new.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/tag-groups-new.js.es6
rename to app/assets/javascripts/discourse/controllers/tag-groups-new.js
diff --git a/app/assets/javascripts/discourse/controllers/tag-groups.js.es6 b/app/assets/javascripts/discourse/controllers/tag-groups.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/tag-groups.js.es6
rename to app/assets/javascripts/discourse/controllers/tag-groups.js
diff --git a/app/assets/javascripts/discourse/controllers/tags-index.js.es6 b/app/assets/javascripts/discourse/controllers/tags-index.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/tags-index.js.es6
rename to app/assets/javascripts/discourse/controllers/tags-index.js
diff --git a/app/assets/javascripts/discourse/controllers/tags-show.js.es6 b/app/assets/javascripts/discourse/controllers/tags-show.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/tags-show.js.es6
rename to app/assets/javascripts/discourse/controllers/tags-show.js
diff --git a/app/assets/javascripts/discourse/controllers/topic-bulk-actions.js.es6 b/app/assets/javascripts/discourse/controllers/topic-bulk-actions.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/topic-bulk-actions.js.es6
rename to app/assets/javascripts/discourse/controllers/topic-bulk-actions.js
diff --git a/app/assets/javascripts/discourse/controllers/topic.js.es6 b/app/assets/javascripts/discourse/controllers/topic.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/topic.js.es6
rename to app/assets/javascripts/discourse/controllers/topic.js
diff --git a/app/assets/javascripts/discourse/controllers/upload-selector.js.es6 b/app/assets/javascripts/discourse/controllers/upload-selector.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/upload-selector.js.es6
rename to app/assets/javascripts/discourse/controllers/upload-selector.js
diff --git a/app/assets/javascripts/discourse/controllers/user-activity-bookmarks-with-reminders.js.es6 b/app/assets/javascripts/discourse/controllers/user-activity-bookmarks-with-reminders.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/user-activity-bookmarks-with-reminders.js.es6
rename to app/assets/javascripts/discourse/controllers/user-activity-bookmarks-with-reminders.js
diff --git a/app/assets/javascripts/discourse/controllers/user-activity.js.es6 b/app/assets/javascripts/discourse/controllers/user-activity.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/user-activity.js.es6
rename to app/assets/javascripts/discourse/controllers/user-activity.js
diff --git a/app/assets/javascripts/discourse/controllers/user-badges.js.es6 b/app/assets/javascripts/discourse/controllers/user-badges.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/user-badges.js.es6
rename to app/assets/javascripts/discourse/controllers/user-badges.js
diff --git a/app/assets/javascripts/discourse/controllers/user-card.js.es6 b/app/assets/javascripts/discourse/controllers/user-card.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/user-card.js.es6
rename to app/assets/javascripts/discourse/controllers/user-card.js
diff --git a/app/assets/javascripts/discourse/controllers/user-invited-show.js.es6 b/app/assets/javascripts/discourse/controllers/user-invited-show.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/user-invited-show.js.es6
rename to app/assets/javascripts/discourse/controllers/user-invited-show.js
diff --git a/app/assets/javascripts/discourse/controllers/user-notifications.js.es6 b/app/assets/javascripts/discourse/controllers/user-notifications.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/user-notifications.js.es6
rename to app/assets/javascripts/discourse/controllers/user-notifications.js
diff --git a/app/assets/javascripts/discourse/controllers/user-posts.js.es6 b/app/assets/javascripts/discourse/controllers/user-posts.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/user-posts.js.es6
rename to app/assets/javascripts/discourse/controllers/user-posts.js
diff --git a/app/assets/javascripts/discourse/controllers/user-private-messages-tags.js.es6 b/app/assets/javascripts/discourse/controllers/user-private-messages-tags.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/user-private-messages-tags.js.es6
rename to app/assets/javascripts/discourse/controllers/user-private-messages-tags.js
diff --git a/app/assets/javascripts/discourse/controllers/user-private-messages.js.es6 b/app/assets/javascripts/discourse/controllers/user-private-messages.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/user-private-messages.js.es6
rename to app/assets/javascripts/discourse/controllers/user-private-messages.js
diff --git a/app/assets/javascripts/discourse/controllers/user-summary.js.es6 b/app/assets/javascripts/discourse/controllers/user-summary.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/user-summary.js.es6
rename to app/assets/javascripts/discourse/controllers/user-summary.js
diff --git a/app/assets/javascripts/discourse/controllers/user-topics-list.js.es6 b/app/assets/javascripts/discourse/controllers/user-topics-list.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/user-topics-list.js.es6
rename to app/assets/javascripts/discourse/controllers/user-topics-list.js
diff --git a/app/assets/javascripts/discourse/controllers/user.js.es6 b/app/assets/javascripts/discourse/controllers/user.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/user.js.es6
rename to app/assets/javascripts/discourse/controllers/user.js
diff --git a/app/assets/javascripts/discourse/controllers/users.js.es6 b/app/assets/javascripts/discourse/controllers/users.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/users.js.es6
rename to app/assets/javascripts/discourse/controllers/users.js
diff --git a/app/assets/javascripts/discourse/helpers/application.js.es6 b/app/assets/javascripts/discourse/helpers/application.js
similarity index 100%
rename from app/assets/javascripts/discourse/helpers/application.js.es6
rename to app/assets/javascripts/discourse/helpers/application.js
diff --git a/app/assets/javascripts/discourse/helpers/border-color.js.es6 b/app/assets/javascripts/discourse/helpers/border-color.js
similarity index 100%
rename from app/assets/javascripts/discourse/helpers/border-color.js.es6
rename to app/assets/javascripts/discourse/helpers/border-color.js
diff --git a/app/assets/javascripts/discourse/helpers/bound-avatar-template.js.es6 b/app/assets/javascripts/discourse/helpers/bound-avatar-template.js
similarity index 100%
rename from app/assets/javascripts/discourse/helpers/bound-avatar-template.js.es6
rename to app/assets/javascripts/discourse/helpers/bound-avatar-template.js
diff --git a/app/assets/javascripts/discourse/helpers/bound-avatar.js.es6 b/app/assets/javascripts/discourse/helpers/bound-avatar.js
similarity index 100%
rename from app/assets/javascripts/discourse/helpers/bound-avatar.js.es6
rename to app/assets/javascripts/discourse/helpers/bound-avatar.js
diff --git a/app/assets/javascripts/discourse/helpers/bound-category-link.js.es6 b/app/assets/javascripts/discourse/helpers/bound-category-link.js
similarity index 100%
rename from app/assets/javascripts/discourse/helpers/bound-category-link.js.es6
rename to app/assets/javascripts/discourse/helpers/bound-category-link.js
diff --git a/app/assets/javascripts/discourse/helpers/bound-date.js.es6 b/app/assets/javascripts/discourse/helpers/bound-date.js
similarity index 100%
rename from app/assets/javascripts/discourse/helpers/bound-date.js.es6
rename to app/assets/javascripts/discourse/helpers/bound-date.js
diff --git a/app/assets/javascripts/discourse/helpers/capitalize-string.js.es6 b/app/assets/javascripts/discourse/helpers/capitalize-string.js
similarity index 100%
rename from app/assets/javascripts/discourse/helpers/capitalize-string.js.es6
rename to app/assets/javascripts/discourse/helpers/capitalize-string.js
diff --git a/app/assets/javascripts/discourse/helpers/category-badge.js.es6 b/app/assets/javascripts/discourse/helpers/category-badge.js
similarity index 100%
rename from app/assets/javascripts/discourse/helpers/category-badge.js.es6
rename to app/assets/javascripts/discourse/helpers/category-badge.js
diff --git a/app/assets/javascripts/discourse/helpers/category-link.js.es6 b/app/assets/javascripts/discourse/helpers/category-link.js
similarity index 100%
rename from app/assets/javascripts/discourse/helpers/category-link.js.es6
rename to app/assets/javascripts/discourse/helpers/category-link.js
diff --git a/app/assets/javascripts/discourse/helpers/cold-age-class.js.es6 b/app/assets/javascripts/discourse/helpers/cold-age-class.js
similarity index 100%
rename from app/assets/javascripts/discourse/helpers/cold-age-class.js.es6
rename to app/assets/javascripts/discourse/helpers/cold-age-class.js
diff --git a/app/assets/javascripts/discourse/helpers/custom-html.js.es6 b/app/assets/javascripts/discourse/helpers/custom-html.js
similarity index 100%
rename from app/assets/javascripts/discourse/helpers/custom-html.js.es6
rename to app/assets/javascripts/discourse/helpers/custom-html.js
diff --git a/app/assets/javascripts/discourse/helpers/dash-if-empty.js.es6 b/app/assets/javascripts/discourse/helpers/dash-if-empty.js
similarity index 100%
rename from app/assets/javascripts/discourse/helpers/dash-if-empty.js.es6
rename to app/assets/javascripts/discourse/helpers/dash-if-empty.js
diff --git a/app/assets/javascripts/discourse/helpers/dasherize.js.es6 b/app/assets/javascripts/discourse/helpers/dasherize.js
similarity index 100%
rename from app/assets/javascripts/discourse/helpers/dasherize.js.es6
rename to app/assets/javascripts/discourse/helpers/dasherize.js
diff --git a/app/assets/javascripts/discourse/helpers/dir-span.js.es6 b/app/assets/javascripts/discourse/helpers/dir-span.js
similarity index 100%
rename from app/assets/javascripts/discourse/helpers/dir-span.js.es6
rename to app/assets/javascripts/discourse/helpers/dir-span.js
diff --git a/app/assets/javascripts/discourse/helpers/discourse-tag.js.es6 b/app/assets/javascripts/discourse/helpers/discourse-tag.js
similarity index 100%
rename from app/assets/javascripts/discourse/helpers/discourse-tag.js.es6
rename to app/assets/javascripts/discourse/helpers/discourse-tag.js
diff --git a/app/assets/javascripts/discourse/helpers/discourse-tags.js.es6 b/app/assets/javascripts/discourse/helpers/discourse-tags.js
similarity index 100%
rename from app/assets/javascripts/discourse/helpers/discourse-tags.js.es6
rename to app/assets/javascripts/discourse/helpers/discourse-tags.js
diff --git a/app/assets/javascripts/discourse/helpers/editable-value.js.es6 b/app/assets/javascripts/discourse/helpers/editable-value.js
similarity index 100%
rename from app/assets/javascripts/discourse/helpers/editable-value.js.es6
rename to app/assets/javascripts/discourse/helpers/editable-value.js
diff --git a/app/assets/javascripts/discourse/helpers/fa-icon-node.js.es6 b/app/assets/javascripts/discourse/helpers/fa-icon-node.js
similarity index 100%
rename from app/assets/javascripts/discourse/helpers/fa-icon-node.js.es6
rename to app/assets/javascripts/discourse/helpers/fa-icon-node.js
diff --git a/app/assets/javascripts/discourse/helpers/float.js.es6 b/app/assets/javascripts/discourse/helpers/float.js
similarity index 100%
rename from app/assets/javascripts/discourse/helpers/float.js.es6
rename to app/assets/javascripts/discourse/helpers/float.js
diff --git a/app/assets/javascripts/discourse/helpers/format-age.js.es6 b/app/assets/javascripts/discourse/helpers/format-age.js
similarity index 100%
rename from app/assets/javascripts/discourse/helpers/format-age.js.es6
rename to app/assets/javascripts/discourse/helpers/format-age.js
diff --git a/app/assets/javascripts/discourse/helpers/format-date.js.es6 b/app/assets/javascripts/discourse/helpers/format-date.js
similarity index 100%
rename from app/assets/javascripts/discourse/helpers/format-date.js.es6
rename to app/assets/javascripts/discourse/helpers/format-date.js
diff --git a/app/assets/javascripts/discourse/helpers/format-username.js.es6 b/app/assets/javascripts/discourse/helpers/format-username.js
similarity index 100%
rename from app/assets/javascripts/discourse/helpers/format-username.js.es6
rename to app/assets/javascripts/discourse/helpers/format-username.js
diff --git a/app/assets/javascripts/discourse/helpers/icon-or-image.js.es6 b/app/assets/javascripts/discourse/helpers/icon-or-image.js
similarity index 100%
rename from app/assets/javascripts/discourse/helpers/icon-or-image.js.es6
rename to app/assets/javascripts/discourse/helpers/icon-or-image.js
diff --git a/app/assets/javascripts/discourse/helpers/inline-date.js.es6 b/app/assets/javascripts/discourse/helpers/inline-date.js
similarity index 100%
rename from app/assets/javascripts/discourse/helpers/inline-date.js.es6
rename to app/assets/javascripts/discourse/helpers/inline-date.js
diff --git a/app/assets/javascripts/discourse/helpers/node.js.es6 b/app/assets/javascripts/discourse/helpers/node.js
similarity index 100%
rename from app/assets/javascripts/discourse/helpers/node.js.es6
rename to app/assets/javascripts/discourse/helpers/node.js
diff --git a/app/assets/javascripts/discourse/helpers/period-title.js.es6 b/app/assets/javascripts/discourse/helpers/period-title.js
similarity index 100%
rename from app/assets/javascripts/discourse/helpers/period-title.js.es6
rename to app/assets/javascripts/discourse/helpers/period-title.js
diff --git a/app/assets/javascripts/discourse/helpers/raw-plugin-outlet.js.es6 b/app/assets/javascripts/discourse/helpers/raw-plugin-outlet.js
similarity index 100%
rename from app/assets/javascripts/discourse/helpers/raw-plugin-outlet.js.es6
rename to app/assets/javascripts/discourse/helpers/raw-plugin-outlet.js
diff --git a/app/assets/javascripts/discourse/helpers/raw.js.es6 b/app/assets/javascripts/discourse/helpers/raw.js
similarity index 100%
rename from app/assets/javascripts/discourse/helpers/raw.js.es6
rename to app/assets/javascripts/discourse/helpers/raw.js
diff --git a/app/assets/javascripts/discourse/helpers/replace-emoji.js.es6 b/app/assets/javascripts/discourse/helpers/replace-emoji.js
similarity index 100%
rename from app/assets/javascripts/discourse/helpers/replace-emoji.js.es6
rename to app/assets/javascripts/discourse/helpers/replace-emoji.js
diff --git a/app/assets/javascripts/discourse/helpers/reviewable-history-description.js.es6 b/app/assets/javascripts/discourse/helpers/reviewable-history-description.js
similarity index 100%
rename from app/assets/javascripts/discourse/helpers/reviewable-history-description.js.es6
rename to app/assets/javascripts/discourse/helpers/reviewable-history-description.js
diff --git a/app/assets/javascripts/discourse/helpers/reviewable-status.js.es6 b/app/assets/javascripts/discourse/helpers/reviewable-status.js
similarity index 100%
rename from app/assets/javascripts/discourse/helpers/reviewable-status.js.es6
rename to app/assets/javascripts/discourse/helpers/reviewable-status.js
diff --git a/app/assets/javascripts/discourse/helpers/route-action.js.es6 b/app/assets/javascripts/discourse/helpers/route-action.js
similarity index 100%
rename from app/assets/javascripts/discourse/helpers/route-action.js.es6
rename to app/assets/javascripts/discourse/helpers/route-action.js
diff --git a/app/assets/javascripts/discourse/helpers/shorten-url.js.es6 b/app/assets/javascripts/discourse/helpers/shorten-url.js
similarity index 100%
rename from app/assets/javascripts/discourse/helpers/shorten-url.js.es6
rename to app/assets/javascripts/discourse/helpers/shorten-url.js
diff --git a/app/assets/javascripts/discourse/helpers/theme-helpers.js.es6 b/app/assets/javascripts/discourse/helpers/theme-helpers.js
similarity index 100%
rename from app/assets/javascripts/discourse/helpers/theme-helpers.js.es6
rename to app/assets/javascripts/discourse/helpers/theme-helpers.js
diff --git a/app/assets/javascripts/discourse/helpers/topic-featured-link.js.es6 b/app/assets/javascripts/discourse/helpers/topic-featured-link.js
similarity index 100%
rename from app/assets/javascripts/discourse/helpers/topic-featured-link.js.es6
rename to app/assets/javascripts/discourse/helpers/topic-featured-link.js
diff --git a/app/assets/javascripts/discourse/helpers/topic-link.js.es6 b/app/assets/javascripts/discourse/helpers/topic-link.js
similarity index 100%
rename from app/assets/javascripts/discourse/helpers/topic-link.js.es6
rename to app/assets/javascripts/discourse/helpers/topic-link.js
diff --git a/app/assets/javascripts/discourse/helpers/topic-status-icons.js.es6 b/app/assets/javascripts/discourse/helpers/topic-status-icons.js
similarity index 100%
rename from app/assets/javascripts/discourse/helpers/topic-status-icons.js.es6
rename to app/assets/javascripts/discourse/helpers/topic-status-icons.js
diff --git a/app/assets/javascripts/discourse/helpers/user-avatar.js.es6 b/app/assets/javascripts/discourse/helpers/user-avatar.js
similarity index 100%
rename from app/assets/javascripts/discourse/helpers/user-avatar.js.es6
rename to app/assets/javascripts/discourse/helpers/user-avatar.js
diff --git a/app/assets/javascripts/discourse/helpers/user-status.js.es6 b/app/assets/javascripts/discourse/helpers/user-status.js
similarity index 100%
rename from app/assets/javascripts/discourse/helpers/user-status.js.es6
rename to app/assets/javascripts/discourse/helpers/user-status.js
diff --git a/app/assets/javascripts/discourse/initializers/asset-version.js.es6 b/app/assets/javascripts/discourse/initializers/asset-version.js
similarity index 100%
rename from app/assets/javascripts/discourse/initializers/asset-version.js.es6
rename to app/assets/javascripts/discourse/initializers/asset-version.js
diff --git a/app/assets/javascripts/discourse/initializers/auth-complete.js.es6 b/app/assets/javascripts/discourse/initializers/auth-complete.js
similarity index 100%
rename from app/assets/javascripts/discourse/initializers/auth-complete.js.es6
rename to app/assets/javascripts/discourse/initializers/auth-complete.js
diff --git a/app/assets/javascripts/discourse/initializers/auto-load-modules.js.es6 b/app/assets/javascripts/discourse/initializers/auto-load-modules.js
similarity index 100%
rename from app/assets/javascripts/discourse/initializers/auto-load-modules.js.es6
rename to app/assets/javascripts/discourse/initializers/auto-load-modules.js
diff --git a/app/assets/javascripts/discourse/initializers/avatar-select.js.es6 b/app/assets/javascripts/discourse/initializers/avatar-select.js
similarity index 100%
rename from app/assets/javascripts/discourse/initializers/avatar-select.js.es6
rename to app/assets/javascripts/discourse/initializers/avatar-select.js
diff --git a/app/assets/javascripts/discourse/initializers/badging.js.es6 b/app/assets/javascripts/discourse/initializers/badging.js
similarity index 100%
rename from app/assets/javascripts/discourse/initializers/badging.js.es6
rename to app/assets/javascripts/discourse/initializers/badging.js
diff --git a/app/assets/javascripts/discourse/initializers/banner.js.es6 b/app/assets/javascripts/discourse/initializers/banner.js
similarity index 100%
rename from app/assets/javascripts/discourse/initializers/banner.js.es6
rename to app/assets/javascripts/discourse/initializers/banner.js
diff --git a/app/assets/javascripts/discourse/initializers/click-interceptor.js.es6 b/app/assets/javascripts/discourse/initializers/click-interceptor.js
similarity index 100%
rename from app/assets/javascripts/discourse/initializers/click-interceptor.js.es6
rename to app/assets/javascripts/discourse/initializers/click-interceptor.js
diff --git a/app/assets/javascripts/discourse/initializers/csrf-token.js.es6 b/app/assets/javascripts/discourse/initializers/csrf-token.js
similarity index 100%
rename from app/assets/javascripts/discourse/initializers/csrf-token.js.es6
rename to app/assets/javascripts/discourse/initializers/csrf-token.js
diff --git a/app/assets/javascripts/discourse/initializers/d-popover.js.es6 b/app/assets/javascripts/discourse/initializers/d-popover.js
similarity index 100%
rename from app/assets/javascripts/discourse/initializers/d-popover.js.es6
rename to app/assets/javascripts/discourse/initializers/d-popover.js
diff --git a/app/assets/javascripts/discourse/initializers/ember-events.js.es6 b/app/assets/javascripts/discourse/initializers/ember-events.js
similarity index 100%
rename from app/assets/javascripts/discourse/initializers/ember-events.js.es6
rename to app/assets/javascripts/discourse/initializers/ember-events.js
diff --git a/app/assets/javascripts/discourse/initializers/enable-emoji.js.es6 b/app/assets/javascripts/discourse/initializers/enable-emoji.js
similarity index 100%
rename from app/assets/javascripts/discourse/initializers/enable-emoji.js.es6
rename to app/assets/javascripts/discourse/initializers/enable-emoji.js
diff --git a/app/assets/javascripts/discourse/initializers/ensure-max-image-dimensions.js.es6 b/app/assets/javascripts/discourse/initializers/ensure-max-image-dimensions.js
similarity index 100%
rename from app/assets/javascripts/discourse/initializers/ensure-max-image-dimensions.js.es6
rename to app/assets/javascripts/discourse/initializers/ensure-max-image-dimensions.js
diff --git a/app/assets/javascripts/discourse/initializers/inject-objects.js.es6 b/app/assets/javascripts/discourse/initializers/inject-objects.js
similarity index 100%
rename from app/assets/javascripts/discourse/initializers/inject-objects.js.es6
rename to app/assets/javascripts/discourse/initializers/inject-objects.js
diff --git a/app/assets/javascripts/discourse/initializers/jquery-plugins.js.es6 b/app/assets/javascripts/discourse/initializers/jquery-plugins.js
similarity index 100%
rename from app/assets/javascripts/discourse/initializers/jquery-plugins.js.es6
rename to app/assets/javascripts/discourse/initializers/jquery-plugins.js
diff --git a/app/assets/javascripts/discourse/initializers/keyboard-shortcuts.js.es6 b/app/assets/javascripts/discourse/initializers/keyboard-shortcuts.js
similarity index 100%
rename from app/assets/javascripts/discourse/initializers/keyboard-shortcuts.js.es6
rename to app/assets/javascripts/discourse/initializers/keyboard-shortcuts.js
diff --git a/app/assets/javascripts/discourse/initializers/live-development.js.es6 b/app/assets/javascripts/discourse/initializers/live-development.js
similarity index 100%
rename from app/assets/javascripts/discourse/initializers/live-development.js.es6
rename to app/assets/javascripts/discourse/initializers/live-development.js
diff --git a/app/assets/javascripts/discourse/initializers/localization.js.es6 b/app/assets/javascripts/discourse/initializers/localization.js
similarity index 100%
rename from app/assets/javascripts/discourse/initializers/localization.js.es6
rename to app/assets/javascripts/discourse/initializers/localization.js
diff --git a/app/assets/javascripts/discourse/initializers/logout.js.es6 b/app/assets/javascripts/discourse/initializers/logout.js
similarity index 100%
rename from app/assets/javascripts/discourse/initializers/logout.js.es6
rename to app/assets/javascripts/discourse/initializers/logout.js
diff --git a/app/assets/javascripts/discourse/initializers/logs-notice.js.es6 b/app/assets/javascripts/discourse/initializers/logs-notice.js
similarity index 100%
rename from app/assets/javascripts/discourse/initializers/logs-notice.js.es6
rename to app/assets/javascripts/discourse/initializers/logs-notice.js
diff --git a/app/assets/javascripts/discourse/initializers/message-bus.js.es6 b/app/assets/javascripts/discourse/initializers/message-bus.js
similarity index 100%
rename from app/assets/javascripts/discourse/initializers/message-bus.js.es6
rename to app/assets/javascripts/discourse/initializers/message-bus.js
diff --git a/app/assets/javascripts/discourse/initializers/mobile.js.es6 b/app/assets/javascripts/discourse/initializers/mobile.js
similarity index 100%
rename from app/assets/javascripts/discourse/initializers/mobile.js.es6
rename to app/assets/javascripts/discourse/initializers/mobile.js
diff --git a/app/assets/javascripts/discourse/initializers/page-tracking.js.es6 b/app/assets/javascripts/discourse/initializers/page-tracking.js
similarity index 100%
rename from app/assets/javascripts/discourse/initializers/page-tracking.js.es6
rename to app/assets/javascripts/discourse/initializers/page-tracking.js
diff --git a/app/assets/javascripts/discourse/initializers/post-decorations.js.es6 b/app/assets/javascripts/discourse/initializers/post-decorations.js
similarity index 100%
rename from app/assets/javascripts/discourse/initializers/post-decorations.js.es6
rename to app/assets/javascripts/discourse/initializers/post-decorations.js
diff --git a/app/assets/javascripts/discourse/initializers/read-only.js.es6 b/app/assets/javascripts/discourse/initializers/read-only.js
similarity index 100%
rename from app/assets/javascripts/discourse/initializers/read-only.js.es6
rename to app/assets/javascripts/discourse/initializers/read-only.js
diff --git a/app/assets/javascripts/discourse/initializers/register-discourse-location.js.es6 b/app/assets/javascripts/discourse/initializers/register-discourse-location.js
similarity index 100%
rename from app/assets/javascripts/discourse/initializers/register-discourse-location.js.es6
rename to app/assets/javascripts/discourse/initializers/register-discourse-location.js
diff --git a/app/assets/javascripts/discourse/initializers/register-service-worker.js.es6 b/app/assets/javascripts/discourse/initializers/register-service-worker.js
similarity index 100%
rename from app/assets/javascripts/discourse/initializers/register-service-worker.js.es6
rename to app/assets/javascripts/discourse/initializers/register-service-worker.js
diff --git a/app/assets/javascripts/discourse/initializers/relative-ages.js.es6 b/app/assets/javascripts/discourse/initializers/relative-ages.js
similarity index 100%
rename from app/assets/javascripts/discourse/initializers/relative-ages.js.es6
rename to app/assets/javascripts/discourse/initializers/relative-ages.js
diff --git a/app/assets/javascripts/discourse/initializers/sharing-sources.js.es6 b/app/assets/javascripts/discourse/initializers/sharing-sources.js
similarity index 100%
rename from app/assets/javascripts/discourse/initializers/sharing-sources.js.es6
rename to app/assets/javascripts/discourse/initializers/sharing-sources.js
diff --git a/app/assets/javascripts/discourse/initializers/show-footer.js.es6 b/app/assets/javascripts/discourse/initializers/show-footer.js
similarity index 100%
rename from app/assets/javascripts/discourse/initializers/show-footer.js.es6
rename to app/assets/javascripts/discourse/initializers/show-footer.js
diff --git a/app/assets/javascripts/discourse/initializers/signup-cta.js.es6 b/app/assets/javascripts/discourse/initializers/signup-cta.js
similarity index 100%
rename from app/assets/javascripts/discourse/initializers/signup-cta.js.es6
rename to app/assets/javascripts/discourse/initializers/signup-cta.js
diff --git a/app/assets/javascripts/discourse/initializers/strip-mobile-app-url-params.js.es6 b/app/assets/javascripts/discourse/initializers/strip-mobile-app-url-params.js
similarity index 100%
rename from app/assets/javascripts/discourse/initializers/strip-mobile-app-url-params.js.es6
rename to app/assets/javascripts/discourse/initializers/strip-mobile-app-url-params.js
diff --git a/app/assets/javascripts/discourse/initializers/subscribe-user-notifications.js.es6 b/app/assets/javascripts/discourse/initializers/subscribe-user-notifications.js
similarity index 100%
rename from app/assets/javascripts/discourse/initializers/subscribe-user-notifications.js.es6
rename to app/assets/javascripts/discourse/initializers/subscribe-user-notifications.js
diff --git a/app/assets/javascripts/discourse/initializers/title-notifications.js.es6 b/app/assets/javascripts/discourse/initializers/title-notifications.js
similarity index 100%
rename from app/assets/javascripts/discourse/initializers/title-notifications.js.es6
rename to app/assets/javascripts/discourse/initializers/title-notifications.js
diff --git a/app/assets/javascripts/discourse/initializers/topic-footer-buttons.js.es6 b/app/assets/javascripts/discourse/initializers/topic-footer-buttons.js
similarity index 100%
rename from app/assets/javascripts/discourse/initializers/topic-footer-buttons.js.es6
rename to app/assets/javascripts/discourse/initializers/topic-footer-buttons.js
diff --git a/app/assets/javascripts/discourse/initializers/url-redirects.js.es6 b/app/assets/javascripts/discourse/initializers/url-redirects.js
similarity index 100%
rename from app/assets/javascripts/discourse/initializers/url-redirects.js.es6
rename to app/assets/javascripts/discourse/initializers/url-redirects.js
diff --git a/app/assets/javascripts/discourse/lib/after-transition.js.es6 b/app/assets/javascripts/discourse/lib/after-transition.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/after-transition.js.es6
rename to app/assets/javascripts/discourse/lib/after-transition.js
diff --git a/app/assets/javascripts/discourse/lib/ajax-error.js.es6 b/app/assets/javascripts/discourse/lib/ajax-error.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/ajax-error.js.es6
rename to app/assets/javascripts/discourse/lib/ajax-error.js
diff --git a/app/assets/javascripts/discourse/lib/autocomplete.js.es6 b/app/assets/javascripts/discourse/lib/autocomplete.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/autocomplete.js.es6
rename to app/assets/javascripts/discourse/lib/autocomplete.js
diff --git a/app/assets/javascripts/discourse/lib/cached-topic-list.js.es6 b/app/assets/javascripts/discourse/lib/cached-topic-list.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/cached-topic-list.js.es6
rename to app/assets/javascripts/discourse/lib/cached-topic-list.js
diff --git a/app/assets/javascripts/discourse/lib/category-hashtags.js.es6 b/app/assets/javascripts/discourse/lib/category-hashtags.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/category-hashtags.js.es6
rename to app/assets/javascripts/discourse/lib/category-hashtags.js
diff --git a/app/assets/javascripts/discourse/lib/category-tag-search.js.es6 b/app/assets/javascripts/discourse/lib/category-tag-search.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/category-tag-search.js.es6
rename to app/assets/javascripts/discourse/lib/category-tag-search.js
diff --git a/app/assets/javascripts/discourse/lib/clean-dom.js.es6 b/app/assets/javascripts/discourse/lib/clean-dom.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/clean-dom.js.es6
rename to app/assets/javascripts/discourse/lib/clean-dom.js
diff --git a/app/assets/javascripts/discourse/lib/click-track.js.es6 b/app/assets/javascripts/discourse/lib/click-track.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/click-track.js.es6
rename to app/assets/javascripts/discourse/lib/click-track.js
diff --git a/app/assets/javascripts/discourse/lib/computed.js.es6 b/app/assets/javascripts/discourse/lib/computed.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/computed.js.es6
rename to app/assets/javascripts/discourse/lib/computed.js
diff --git a/app/assets/javascripts/discourse/lib/copy-text.js.es6 b/app/assets/javascripts/discourse/lib/copy-text.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/copy-text.js.es6
rename to app/assets/javascripts/discourse/lib/copy-text.js
diff --git a/app/assets/javascripts/discourse/lib/d-popover.js.es6 b/app/assets/javascripts/discourse/lib/d-popover.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/d-popover.js.es6
rename to app/assets/javascripts/discourse/lib/d-popover.js
diff --git a/app/assets/javascripts/discourse/lib/debounce.js.es6 b/app/assets/javascripts/discourse/lib/debounce.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/debounce.js.es6
rename to app/assets/javascripts/discourse/lib/debounce.js
diff --git a/app/assets/javascripts/discourse/lib/decimal-adjust.js.es6 b/app/assets/javascripts/discourse/lib/decimal-adjust.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/decimal-adjust.js.es6
rename to app/assets/javascripts/discourse/lib/decimal-adjust.js
diff --git a/app/assets/javascripts/discourse/lib/desktop-notifications.js.es6 b/app/assets/javascripts/discourse/lib/desktop-notifications.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/desktop-notifications.js.es6
rename to app/assets/javascripts/discourse/lib/desktop-notifications.js
diff --git a/app/assets/javascripts/discourse/lib/dirty-keys.js.es6 b/app/assets/javascripts/discourse/lib/dirty-keys.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/dirty-keys.js.es6
rename to app/assets/javascripts/discourse/lib/dirty-keys.js
diff --git a/app/assets/javascripts/discourse/lib/discourse-location.js.es6 b/app/assets/javascripts/discourse/lib/discourse-location.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/discourse-location.js.es6
rename to app/assets/javascripts/discourse/lib/discourse-location.js
diff --git a/app/assets/javascripts/discourse/lib/export-csv.js.es6 b/app/assets/javascripts/discourse/lib/export-csv.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/export-csv.js.es6
rename to app/assets/javascripts/discourse/lib/export-csv.js
diff --git a/app/assets/javascripts/discourse/lib/export-result.js.es6 b/app/assets/javascripts/discourse/lib/export-result.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/export-result.js.es6
rename to app/assets/javascripts/discourse/lib/export-result.js
diff --git a/app/assets/javascripts/discourse/lib/eyeline.js.es6 b/app/assets/javascripts/discourse/lib/eyeline.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/eyeline.js.es6
rename to app/assets/javascripts/discourse/lib/eyeline.js
diff --git a/app/assets/javascripts/discourse/lib/formatter.js.es6 b/app/assets/javascripts/discourse/lib/formatter.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/formatter.js.es6
rename to app/assets/javascripts/discourse/lib/formatter.js
diff --git a/app/assets/javascripts/discourse/lib/hash.js.es6 b/app/assets/javascripts/discourse/lib/hash.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/hash.js.es6
rename to app/assets/javascripts/discourse/lib/hash.js
diff --git a/app/assets/javascripts/discourse/lib/highlight-syntax.js.es6 b/app/assets/javascripts/discourse/lib/highlight-syntax.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/highlight-syntax.js.es6
rename to app/assets/javascripts/discourse/lib/highlight-syntax.js
diff --git a/app/assets/javascripts/discourse/lib/highlight-text.js.es6 b/app/assets/javascripts/discourse/lib/highlight-text.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/highlight-text.js.es6
rename to app/assets/javascripts/discourse/lib/highlight-text.js
diff --git a/app/assets/javascripts/discourse/lib/intercept-click.js.es6 b/app/assets/javascripts/discourse/lib/intercept-click.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/intercept-click.js.es6
rename to app/assets/javascripts/discourse/lib/intercept-click.js
diff --git a/app/assets/javascripts/discourse/lib/is-element-in-viewport.js.es6 b/app/assets/javascripts/discourse/lib/is-element-in-viewport.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/is-element-in-viewport.js.es6
rename to app/assets/javascripts/discourse/lib/is-element-in-viewport.js
diff --git a/app/assets/javascripts/discourse/lib/key-value-store.js.es6 b/app/assets/javascripts/discourse/lib/key-value-store.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/key-value-store.js.es6
rename to app/assets/javascripts/discourse/lib/key-value-store.js
diff --git a/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js.es6 b/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/keyboard-shortcuts.js.es6
rename to app/assets/javascripts/discourse/lib/keyboard-shortcuts.js
diff --git a/app/assets/javascripts/discourse/lib/lazy-load-images.js.es6 b/app/assets/javascripts/discourse/lib/lazy-load-images.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/lazy-load-images.js.es6
rename to app/assets/javascripts/discourse/lib/lazy-load-images.js
diff --git a/app/assets/javascripts/discourse/lib/lightbox.js.es6 b/app/assets/javascripts/discourse/lib/lightbox.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/lightbox.js.es6
rename to app/assets/javascripts/discourse/lib/lightbox.js
diff --git a/app/assets/javascripts/discourse/lib/link-category-hashtags.js.es6 b/app/assets/javascripts/discourse/lib/link-category-hashtags.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/link-category-hashtags.js.es6
rename to app/assets/javascripts/discourse/lib/link-category-hashtags.js
diff --git a/app/assets/javascripts/discourse/lib/link-lookup.js.es6 b/app/assets/javascripts/discourse/lib/link-lookup.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/link-lookup.js.es6
rename to app/assets/javascripts/discourse/lib/link-lookup.js
diff --git a/app/assets/javascripts/discourse/lib/link-mentions.js.es6 b/app/assets/javascripts/discourse/lib/link-mentions.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/link-mentions.js.es6
rename to app/assets/javascripts/discourse/lib/link-mentions.js
diff --git a/app/assets/javascripts/discourse/lib/link-tag-hashtag.js.es6 b/app/assets/javascripts/discourse/lib/link-tag-hashtag.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/link-tag-hashtag.js.es6
rename to app/assets/javascripts/discourse/lib/link-tag-hashtag.js
diff --git a/app/assets/javascripts/discourse/lib/load-script.js.es6 b/app/assets/javascripts/discourse/lib/load-script.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/load-script.js.es6
rename to app/assets/javascripts/discourse/lib/load-script.js
diff --git a/app/assets/javascripts/discourse/lib/lock-on.js.es6 b/app/assets/javascripts/discourse/lib/lock-on.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/lock-on.js.es6
rename to app/assets/javascripts/discourse/lib/lock-on.js
diff --git a/app/assets/javascripts/discourse/lib/logout.js.es6 b/app/assets/javascripts/discourse/lib/logout.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/logout.js.es6
rename to app/assets/javascripts/discourse/lib/logout.js
diff --git a/app/assets/javascripts/discourse/lib/mobile.js.es6 b/app/assets/javascripts/discourse/lib/mobile.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/mobile.js.es6
rename to app/assets/javascripts/discourse/lib/mobile.js
diff --git a/app/assets/javascripts/discourse/lib/notification-levels.js.es6 b/app/assets/javascripts/discourse/lib/notification-levels.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/notification-levels.js.es6
rename to app/assets/javascripts/discourse/lib/notification-levels.js
diff --git a/app/assets/javascripts/discourse/lib/offset-calculator.js.es6 b/app/assets/javascripts/discourse/lib/offset-calculator.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/offset-calculator.js.es6
rename to app/assets/javascripts/discourse/lib/offset-calculator.js
diff --git a/app/assets/javascripts/discourse/lib/optional-service.js.es6 b/app/assets/javascripts/discourse/lib/optional-service.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/optional-service.js.es6
rename to app/assets/javascripts/discourse/lib/optional-service.js
diff --git a/app/assets/javascripts/discourse/lib/page-tracker.js.es6 b/app/assets/javascripts/discourse/lib/page-tracker.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/page-tracker.js.es6
rename to app/assets/javascripts/discourse/lib/page-tracker.js
diff --git a/app/assets/javascripts/discourse/lib/page-visible.js.es6 b/app/assets/javascripts/discourse/lib/page-visible.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/page-visible.js.es6
rename to app/assets/javascripts/discourse/lib/page-visible.js
diff --git a/app/assets/javascripts/discourse/lib/plugin-api.js.es6 b/app/assets/javascripts/discourse/lib/plugin-api.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/plugin-api.js.es6
rename to app/assets/javascripts/discourse/lib/plugin-api.js
diff --git a/app/assets/javascripts/discourse/lib/plugin-connectors.js.es6 b/app/assets/javascripts/discourse/lib/plugin-connectors.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/plugin-connectors.js.es6
rename to app/assets/javascripts/discourse/lib/plugin-connectors.js
diff --git a/app/assets/javascripts/discourse/lib/posts-with-placeholders.js.es6 b/app/assets/javascripts/discourse/lib/posts-with-placeholders.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/posts-with-placeholders.js.es6
rename to app/assets/javascripts/discourse/lib/posts-with-placeholders.js
diff --git a/app/assets/javascripts/discourse/lib/push-notifications.js.es6 b/app/assets/javascripts/discourse/lib/push-notifications.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/push-notifications.js.es6
rename to app/assets/javascripts/discourse/lib/push-notifications.js
diff --git a/app/assets/javascripts/discourse/lib/pwa-utils.js.es6 b/app/assets/javascripts/discourse/lib/pwa-utils.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/pwa-utils.js.es6
rename to app/assets/javascripts/discourse/lib/pwa-utils.js
diff --git a/app/assets/javascripts/discourse/lib/quote-state.js.es6 b/app/assets/javascripts/discourse/lib/quote-state.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/quote-state.js.es6
rename to app/assets/javascripts/discourse/lib/quote-state.js
diff --git a/app/assets/javascripts/discourse/lib/quote.js.es6 b/app/assets/javascripts/discourse/lib/quote.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/quote.js.es6
rename to app/assets/javascripts/discourse/lib/quote.js
diff --git a/app/assets/javascripts/discourse/lib/raw-templates.js.es6 b/app/assets/javascripts/discourse/lib/raw-templates.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/raw-templates.js.es6
rename to app/assets/javascripts/discourse/lib/raw-templates.js
diff --git a/app/assets/javascripts/discourse/lib/register-topic-footer-button.js.es6 b/app/assets/javascripts/discourse/lib/register-topic-footer-button.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/register-topic-footer-button.js.es6
rename to app/assets/javascripts/discourse/lib/register-topic-footer-button.js
diff --git a/app/assets/javascripts/discourse/lib/render-tag.js.es6 b/app/assets/javascripts/discourse/lib/render-tag.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/render-tag.js.es6
rename to app/assets/javascripts/discourse/lib/render-tag.js
diff --git a/app/assets/javascripts/discourse/lib/render-tags.js.es6 b/app/assets/javascripts/discourse/lib/render-tags.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/render-tags.js.es6
rename to app/assets/javascripts/discourse/lib/render-tags.js
diff --git a/app/assets/javascripts/discourse/lib/render-topic-featured-link.js.es6 b/app/assets/javascripts/discourse/lib/render-topic-featured-link.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/render-topic-featured-link.js.es6
rename to app/assets/javascripts/discourse/lib/render-topic-featured-link.js
diff --git a/app/assets/javascripts/discourse/lib/reports-loader.js.es6 b/app/assets/javascripts/discourse/lib/reports-loader.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/reports-loader.js.es6
rename to app/assets/javascripts/discourse/lib/reports-loader.js
diff --git a/app/assets/javascripts/discourse/lib/round.js.es6 b/app/assets/javascripts/discourse/lib/round.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/round.js.es6
rename to app/assets/javascripts/discourse/lib/round.js
diff --git a/app/assets/javascripts/discourse/lib/safari-hacks.js.es6 b/app/assets/javascripts/discourse/lib/safari-hacks.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/safari-hacks.js.es6
rename to app/assets/javascripts/discourse/lib/safari-hacks.js
diff --git a/app/assets/javascripts/discourse/lib/screen-track.js.es6 b/app/assets/javascripts/discourse/lib/screen-track.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/screen-track.js.es6
rename to app/assets/javascripts/discourse/lib/screen-track.js
diff --git a/app/assets/javascripts/discourse/lib/search.js.es6 b/app/assets/javascripts/discourse/lib/search.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/search.js.es6
rename to app/assets/javascripts/discourse/lib/search.js
diff --git a/app/assets/javascripts/discourse/lib/settings.js.es6 b/app/assets/javascripts/discourse/lib/settings.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/settings.js.es6
rename to app/assets/javascripts/discourse/lib/settings.js
diff --git a/app/assets/javascripts/discourse/lib/sharing.js.es6 b/app/assets/javascripts/discourse/lib/sharing.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/sharing.js.es6
rename to app/assets/javascripts/discourse/lib/sharing.js
diff --git a/app/assets/javascripts/discourse/lib/show-modal.js.es6 b/app/assets/javascripts/discourse/lib/show-modal.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/show-modal.js.es6
rename to app/assets/javascripts/discourse/lib/show-modal.js
diff --git a/app/assets/javascripts/discourse/lib/static-route-builder.js.es6 b/app/assets/javascripts/discourse/lib/static-route-builder.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/static-route-builder.js.es6
rename to app/assets/javascripts/discourse/lib/static-route-builder.js
diff --git a/app/assets/javascripts/discourse/lib/svg-sprite-loader.js.es6 b/app/assets/javascripts/discourse/lib/svg-sprite-loader.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/svg-sprite-loader.js.es6
rename to app/assets/javascripts/discourse/lib/svg-sprite-loader.js
diff --git a/app/assets/javascripts/discourse/lib/tag-hashtags.js.es6 b/app/assets/javascripts/discourse/lib/tag-hashtags.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/tag-hashtags.js.es6
rename to app/assets/javascripts/discourse/lib/tag-hashtags.js
diff --git a/app/assets/javascripts/discourse/lib/text-direction.js.es6 b/app/assets/javascripts/discourse/lib/text-direction.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/text-direction.js.es6
rename to app/assets/javascripts/discourse/lib/text-direction.js
diff --git a/app/assets/javascripts/discourse/lib/text.js.es6 b/app/assets/javascripts/discourse/lib/text.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/text.js.es6
rename to app/assets/javascripts/discourse/lib/text.js
diff --git a/app/assets/javascripts/discourse/lib/theme-selector.js.es6 b/app/assets/javascripts/discourse/lib/theme-selector.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/theme-selector.js.es6
rename to app/assets/javascripts/discourse/lib/theme-selector.js
diff --git a/app/assets/javascripts/discourse/lib/to-markdown.js.es6 b/app/assets/javascripts/discourse/lib/to-markdown.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/to-markdown.js.es6
rename to app/assets/javascripts/discourse/lib/to-markdown.js
diff --git a/app/assets/javascripts/discourse/lib/tooltip.js.es6 b/app/assets/javascripts/discourse/lib/tooltip.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/tooltip.js.es6
rename to app/assets/javascripts/discourse/lib/tooltip.js
diff --git a/app/assets/javascripts/discourse/lib/transform-post.js.es6 b/app/assets/javascripts/discourse/lib/transform-post.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/transform-post.js.es6
rename to app/assets/javascripts/discourse/lib/transform-post.js
diff --git a/app/assets/javascripts/discourse/lib/uploads.js.es6 b/app/assets/javascripts/discourse/lib/uploads.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/uploads.js.es6
rename to app/assets/javascripts/discourse/lib/uploads.js
diff --git a/app/assets/javascripts/discourse/lib/url.js.es6 b/app/assets/javascripts/discourse/lib/url.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/url.js.es6
rename to app/assets/javascripts/discourse/lib/url.js
diff --git a/app/assets/javascripts/discourse/lib/user-activation.js.es6 b/app/assets/javascripts/discourse/lib/user-activation.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/user-activation.js.es6
rename to app/assets/javascripts/discourse/lib/user-activation.js
diff --git a/app/assets/javascripts/discourse/lib/user-search.js.es6 b/app/assets/javascripts/discourse/lib/user-search.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/user-search.js.es6
rename to app/assets/javascripts/discourse/lib/user-search.js
diff --git a/app/assets/javascripts/discourse/lib/utilities.js.es6 b/app/assets/javascripts/discourse/lib/utilities.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/utilities.js.es6
rename to app/assets/javascripts/discourse/lib/utilities.js
diff --git a/app/assets/javascripts/discourse/lib/webauthn.js.es6 b/app/assets/javascripts/discourse/lib/webauthn.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/webauthn.js.es6
rename to app/assets/javascripts/discourse/lib/webauthn.js
diff --git a/app/assets/javascripts/discourse/mapping-router.js.es6 b/app/assets/javascripts/discourse/mapping-router.js
similarity index 100%
rename from app/assets/javascripts/discourse/mapping-router.js.es6
rename to app/assets/javascripts/discourse/mapping-router.js
diff --git a/app/assets/javascripts/discourse/mixins/add-archetype-class.js.es6 b/app/assets/javascripts/discourse/mixins/add-archetype-class.js
similarity index 100%
rename from app/assets/javascripts/discourse/mixins/add-archetype-class.js.es6
rename to app/assets/javascripts/discourse/mixins/add-archetype-class.js
diff --git a/app/assets/javascripts/discourse/mixins/buffered-content.js.es6 b/app/assets/javascripts/discourse/mixins/buffered-content.js
similarity index 100%
rename from app/assets/javascripts/discourse/mixins/buffered-content.js.es6
rename to app/assets/javascripts/discourse/mixins/buffered-content.js
diff --git a/app/assets/javascripts/discourse/mixins/bulk-topic-selection.js.es6 b/app/assets/javascripts/discourse/mixins/bulk-topic-selection.js
similarity index 100%
rename from app/assets/javascripts/discourse/mixins/bulk-topic-selection.js.es6
rename to app/assets/javascripts/discourse/mixins/bulk-topic-selection.js
diff --git a/app/assets/javascripts/discourse/mixins/can-check-emails.js.es6 b/app/assets/javascripts/discourse/mixins/can-check-emails.js
similarity index 100%
rename from app/assets/javascripts/discourse/mixins/can-check-emails.js.es6
rename to app/assets/javascripts/discourse/mixins/can-check-emails.js
diff --git a/app/assets/javascripts/discourse/mixins/card-contents-base.js.es6 b/app/assets/javascripts/discourse/mixins/card-contents-base.js
similarity index 100%
rename from app/assets/javascripts/discourse/mixins/card-contents-base.js.es6
rename to app/assets/javascripts/discourse/mixins/card-contents-base.js
diff --git a/app/assets/javascripts/discourse/mixins/cleans-up.js.es6 b/app/assets/javascripts/discourse/mixins/cleans-up.js
similarity index 100%
rename from app/assets/javascripts/discourse/mixins/cleans-up.js.es6
rename to app/assets/javascripts/discourse/mixins/cleans-up.js
diff --git a/app/assets/javascripts/discourse/mixins/docking.js.es6 b/app/assets/javascripts/discourse/mixins/docking.js
similarity index 100%
rename from app/assets/javascripts/discourse/mixins/docking.js.es6
rename to app/assets/javascripts/discourse/mixins/docking.js
diff --git a/app/assets/javascripts/discourse/mixins/filter-mode.js.es6 b/app/assets/javascripts/discourse/mixins/filter-mode.js
similarity index 100%
rename from app/assets/javascripts/discourse/mixins/filter-mode.js.es6
rename to app/assets/javascripts/discourse/mixins/filter-mode.js
diff --git a/app/assets/javascripts/discourse/mixins/grant-badge-controller.js.es6 b/app/assets/javascripts/discourse/mixins/grant-badge-controller.js
similarity index 100%
rename from app/assets/javascripts/discourse/mixins/grant-badge-controller.js.es6
rename to app/assets/javascripts/discourse/mixins/grant-badge-controller.js
diff --git a/app/assets/javascripts/discourse/mixins/key-enter-escape.js.es6 b/app/assets/javascripts/discourse/mixins/key-enter-escape.js
similarity index 100%
rename from app/assets/javascripts/discourse/mixins/key-enter-escape.js.es6
rename to app/assets/javascripts/discourse/mixins/key-enter-escape.js
diff --git a/app/assets/javascripts/discourse/mixins/load-more.js.es6 b/app/assets/javascripts/discourse/mixins/load-more.js
similarity index 100%
rename from app/assets/javascripts/discourse/mixins/load-more.js.es6
rename to app/assets/javascripts/discourse/mixins/load-more.js
diff --git a/app/assets/javascripts/discourse/mixins/mobile-scroll-direction.js.es6 b/app/assets/javascripts/discourse/mixins/mobile-scroll-direction.js
similarity index 100%
rename from app/assets/javascripts/discourse/mixins/mobile-scroll-direction.js.es6
rename to app/assets/javascripts/discourse/mixins/mobile-scroll-direction.js
diff --git a/app/assets/javascripts/discourse/mixins/modal-functionality.js.es6 b/app/assets/javascripts/discourse/mixins/modal-functionality.js
similarity index 100%
rename from app/assets/javascripts/discourse/mixins/modal-functionality.js.es6
rename to app/assets/javascripts/discourse/mixins/modal-functionality.js
diff --git a/app/assets/javascripts/discourse/mixins/name-validation.js.es6 b/app/assets/javascripts/discourse/mixins/name-validation.js
similarity index 100%
rename from app/assets/javascripts/discourse/mixins/name-validation.js.es6
rename to app/assets/javascripts/discourse/mixins/name-validation.js
diff --git a/app/assets/javascripts/discourse/mixins/open-composer.js.es6 b/app/assets/javascripts/discourse/mixins/open-composer.js
similarity index 100%
rename from app/assets/javascripts/discourse/mixins/open-composer.js.es6
rename to app/assets/javascripts/discourse/mixins/open-composer.js
diff --git a/app/assets/javascripts/discourse/mixins/pan-events.js.es6 b/app/assets/javascripts/discourse/mixins/pan-events.js
similarity index 100%
rename from app/assets/javascripts/discourse/mixins/pan-events.js.es6
rename to app/assets/javascripts/discourse/mixins/pan-events.js
diff --git a/app/assets/javascripts/discourse/mixins/password-validation.js.es6 b/app/assets/javascripts/discourse/mixins/password-validation.js
similarity index 100%
rename from app/assets/javascripts/discourse/mixins/password-validation.js.es6
rename to app/assets/javascripts/discourse/mixins/password-validation.js
diff --git a/app/assets/javascripts/discourse/mixins/scroll-top.js.es6 b/app/assets/javascripts/discourse/mixins/scroll-top.js
similarity index 100%
rename from app/assets/javascripts/discourse/mixins/scroll-top.js.es6
rename to app/assets/javascripts/discourse/mixins/scroll-top.js
diff --git a/app/assets/javascripts/discourse/mixins/scrolling.js.es6 b/app/assets/javascripts/discourse/mixins/scrolling.js
similarity index 100%
rename from app/assets/javascripts/discourse/mixins/scrolling.js.es6
rename to app/assets/javascripts/discourse/mixins/scrolling.js
diff --git a/app/assets/javascripts/discourse/mixins/singleton.js.es6 b/app/assets/javascripts/discourse/mixins/singleton.js
similarity index 100%
rename from app/assets/javascripts/discourse/mixins/singleton.js.es6
rename to app/assets/javascripts/discourse/mixins/singleton.js
diff --git a/app/assets/javascripts/discourse/mixins/upload.js.es6 b/app/assets/javascripts/discourse/mixins/upload.js
similarity index 100%
rename from app/assets/javascripts/discourse/mixins/upload.js.es6
rename to app/assets/javascripts/discourse/mixins/upload.js
diff --git a/app/assets/javascripts/discourse/mixins/url-refresh.js.es6 b/app/assets/javascripts/discourse/mixins/url-refresh.js
similarity index 100%
rename from app/assets/javascripts/discourse/mixins/url-refresh.js.es6
rename to app/assets/javascripts/discourse/mixins/url-refresh.js
diff --git a/app/assets/javascripts/discourse/mixins/user-fields-validation.js.es6 b/app/assets/javascripts/discourse/mixins/user-fields-validation.js
similarity index 100%
rename from app/assets/javascripts/discourse/mixins/user-fields-validation.js.es6
rename to app/assets/javascripts/discourse/mixins/user-fields-validation.js
diff --git a/app/assets/javascripts/discourse/mixins/username-validation.js.es6 b/app/assets/javascripts/discourse/mixins/username-validation.js
similarity index 100%
rename from app/assets/javascripts/discourse/mixins/username-validation.js.es6
rename to app/assets/javascripts/discourse/mixins/username-validation.js
diff --git a/app/assets/javascripts/discourse/mixins/viewing-action-type.js.es6 b/app/assets/javascripts/discourse/mixins/viewing-action-type.js
similarity index 100%
rename from app/assets/javascripts/discourse/mixins/viewing-action-type.js.es6
rename to app/assets/javascripts/discourse/mixins/viewing-action-type.js
diff --git a/app/assets/javascripts/discourse/models/action-summary.js.es6 b/app/assets/javascripts/discourse/models/action-summary.js
similarity index 100%
rename from app/assets/javascripts/discourse/models/action-summary.js.es6
rename to app/assets/javascripts/discourse/models/action-summary.js
diff --git a/app/assets/javascripts/discourse/models/archetype.js.es6 b/app/assets/javascripts/discourse/models/archetype.js
similarity index 100%
rename from app/assets/javascripts/discourse/models/archetype.js.es6
rename to app/assets/javascripts/discourse/models/archetype.js
diff --git a/app/assets/javascripts/discourse/models/badge-grouping.js.es6 b/app/assets/javascripts/discourse/models/badge-grouping.js
similarity index 100%
rename from app/assets/javascripts/discourse/models/badge-grouping.js.es6
rename to app/assets/javascripts/discourse/models/badge-grouping.js
diff --git a/app/assets/javascripts/discourse/models/badge.js.es6 b/app/assets/javascripts/discourse/models/badge.js
similarity index 100%
rename from app/assets/javascripts/discourse/models/badge.js.es6
rename to app/assets/javascripts/discourse/models/badge.js
diff --git a/app/assets/javascripts/discourse/models/bookmark.js.es6 b/app/assets/javascripts/discourse/models/bookmark.js
similarity index 100%
rename from app/assets/javascripts/discourse/models/bookmark.js.es6
rename to app/assets/javascripts/discourse/models/bookmark.js
diff --git a/app/assets/javascripts/discourse/models/category-list.js.es6 b/app/assets/javascripts/discourse/models/category-list.js
similarity index 100%
rename from app/assets/javascripts/discourse/models/category-list.js.es6
rename to app/assets/javascripts/discourse/models/category-list.js
diff --git a/app/assets/javascripts/discourse/models/category.js.es6 b/app/assets/javascripts/discourse/models/category.js
similarity index 100%
rename from app/assets/javascripts/discourse/models/category.js.es6
rename to app/assets/javascripts/discourse/models/category.js
diff --git a/app/assets/javascripts/discourse/models/composer.js.es6 b/app/assets/javascripts/discourse/models/composer.js
similarity index 100%
rename from app/assets/javascripts/discourse/models/composer.js.es6
rename to app/assets/javascripts/discourse/models/composer.js
diff --git a/app/assets/javascripts/discourse/models/draft.js.es6 b/app/assets/javascripts/discourse/models/draft.js
similarity index 100%
rename from app/assets/javascripts/discourse/models/draft.js.es6
rename to app/assets/javascripts/discourse/models/draft.js
diff --git a/app/assets/javascripts/discourse/models/group-history.js.es6 b/app/assets/javascripts/discourse/models/group-history.js
similarity index 100%
rename from app/assets/javascripts/discourse/models/group-history.js.es6
rename to app/assets/javascripts/discourse/models/group-history.js
diff --git a/app/assets/javascripts/discourse/models/group.js.es6 b/app/assets/javascripts/discourse/models/group.js
similarity index 100%
rename from app/assets/javascripts/discourse/models/group.js.es6
rename to app/assets/javascripts/discourse/models/group.js
diff --git a/app/assets/javascripts/discourse/models/invite.js.es6 b/app/assets/javascripts/discourse/models/invite.js
similarity index 100%
rename from app/assets/javascripts/discourse/models/invite.js.es6
rename to app/assets/javascripts/discourse/models/invite.js
diff --git a/app/assets/javascripts/discourse/models/login-method.js.es6 b/app/assets/javascripts/discourse/models/login-method.js
similarity index 100%
rename from app/assets/javascripts/discourse/models/login-method.js.es6
rename to app/assets/javascripts/discourse/models/login-method.js
diff --git a/app/assets/javascripts/discourse/models/nav-item.js.es6 b/app/assets/javascripts/discourse/models/nav-item.js
similarity index 100%
rename from app/assets/javascripts/discourse/models/nav-item.js.es6
rename to app/assets/javascripts/discourse/models/nav-item.js
diff --git a/app/assets/javascripts/discourse/models/permission-type.js.es6 b/app/assets/javascripts/discourse/models/permission-type.js
similarity index 100%
rename from app/assets/javascripts/discourse/models/permission-type.js.es6
rename to app/assets/javascripts/discourse/models/permission-type.js
diff --git a/app/assets/javascripts/discourse/models/post-action-type.js.es6 b/app/assets/javascripts/discourse/models/post-action-type.js
similarity index 100%
rename from app/assets/javascripts/discourse/models/post-action-type.js.es6
rename to app/assets/javascripts/discourse/models/post-action-type.js
diff --git a/app/assets/javascripts/discourse/models/post-stream.js.es6 b/app/assets/javascripts/discourse/models/post-stream.js
similarity index 100%
rename from app/assets/javascripts/discourse/models/post-stream.js.es6
rename to app/assets/javascripts/discourse/models/post-stream.js
diff --git a/app/assets/javascripts/discourse/models/post.js.es6 b/app/assets/javascripts/discourse/models/post.js
similarity index 100%
rename from app/assets/javascripts/discourse/models/post.js.es6
rename to app/assets/javascripts/discourse/models/post.js
diff --git a/app/assets/javascripts/discourse/models/rest.js.es6 b/app/assets/javascripts/discourse/models/rest.js
similarity index 100%
rename from app/assets/javascripts/discourse/models/rest.js.es6
rename to app/assets/javascripts/discourse/models/rest.js
diff --git a/app/assets/javascripts/discourse/models/result-set.js.es6 b/app/assets/javascripts/discourse/models/result-set.js
similarity index 100%
rename from app/assets/javascripts/discourse/models/result-set.js.es6
rename to app/assets/javascripts/discourse/models/result-set.js
diff --git a/app/assets/javascripts/discourse/models/reviewable-history.js.es6 b/app/assets/javascripts/discourse/models/reviewable-history.js
similarity index 100%
rename from app/assets/javascripts/discourse/models/reviewable-history.js.es6
rename to app/assets/javascripts/discourse/models/reviewable-history.js
diff --git a/app/assets/javascripts/discourse/models/reviewable.js.es6 b/app/assets/javascripts/discourse/models/reviewable.js
similarity index 100%
rename from app/assets/javascripts/discourse/models/reviewable.js.es6
rename to app/assets/javascripts/discourse/models/reviewable.js
diff --git a/app/assets/javascripts/discourse/models/session.js.es6 b/app/assets/javascripts/discourse/models/session.js
similarity index 100%
rename from app/assets/javascripts/discourse/models/session.js.es6
rename to app/assets/javascripts/discourse/models/session.js
diff --git a/app/assets/javascripts/discourse/models/site.js.es6 b/app/assets/javascripts/discourse/models/site.js
similarity index 100%
rename from app/assets/javascripts/discourse/models/site.js.es6
rename to app/assets/javascripts/discourse/models/site.js
diff --git a/app/assets/javascripts/discourse/models/static-page.js.es6 b/app/assets/javascripts/discourse/models/static-page.js
similarity index 100%
rename from app/assets/javascripts/discourse/models/static-page.js.es6
rename to app/assets/javascripts/discourse/models/static-page.js
diff --git a/app/assets/javascripts/discourse/models/store.js.es6 b/app/assets/javascripts/discourse/models/store.js
similarity index 100%
rename from app/assets/javascripts/discourse/models/store.js.es6
rename to app/assets/javascripts/discourse/models/store.js
diff --git a/app/assets/javascripts/discourse/models/tag-group.js.es6 b/app/assets/javascripts/discourse/models/tag-group.js
similarity index 100%
rename from app/assets/javascripts/discourse/models/tag-group.js.es6
rename to app/assets/javascripts/discourse/models/tag-group.js
diff --git a/app/assets/javascripts/discourse/models/tag.js.es6 b/app/assets/javascripts/discourse/models/tag.js
similarity index 100%
rename from app/assets/javascripts/discourse/models/tag.js.es6
rename to app/assets/javascripts/discourse/models/tag.js
diff --git a/app/assets/javascripts/discourse/models/topic-details.js.es6 b/app/assets/javascripts/discourse/models/topic-details.js
similarity index 100%
rename from app/assets/javascripts/discourse/models/topic-details.js.es6
rename to app/assets/javascripts/discourse/models/topic-details.js
diff --git a/app/assets/javascripts/discourse/models/topic-list.js.es6 b/app/assets/javascripts/discourse/models/topic-list.js
similarity index 100%
rename from app/assets/javascripts/discourse/models/topic-list.js.es6
rename to app/assets/javascripts/discourse/models/topic-list.js
diff --git a/app/assets/javascripts/discourse/models/topic-timer.js.es6 b/app/assets/javascripts/discourse/models/topic-timer.js
similarity index 100%
rename from app/assets/javascripts/discourse/models/topic-timer.js.es6
rename to app/assets/javascripts/discourse/models/topic-timer.js
diff --git a/app/assets/javascripts/discourse/models/topic-tracking-state.js.es6 b/app/assets/javascripts/discourse/models/topic-tracking-state.js
similarity index 100%
rename from app/assets/javascripts/discourse/models/topic-tracking-state.js.es6
rename to app/assets/javascripts/discourse/models/topic-tracking-state.js
diff --git a/app/assets/javascripts/discourse/models/topic.js.es6 b/app/assets/javascripts/discourse/models/topic.js
similarity index 100%
rename from app/assets/javascripts/discourse/models/topic.js.es6
rename to app/assets/javascripts/discourse/models/topic.js
diff --git a/app/assets/javascripts/discourse/models/trust-level.js.es6 b/app/assets/javascripts/discourse/models/trust-level.js
similarity index 100%
rename from app/assets/javascripts/discourse/models/trust-level.js.es6
rename to app/assets/javascripts/discourse/models/trust-level.js
diff --git a/app/assets/javascripts/discourse/models/user-action-group.js.es6 b/app/assets/javascripts/discourse/models/user-action-group.js
similarity index 100%
rename from app/assets/javascripts/discourse/models/user-action-group.js.es6
rename to app/assets/javascripts/discourse/models/user-action-group.js
diff --git a/app/assets/javascripts/discourse/models/user-action-stat.js.es6 b/app/assets/javascripts/discourse/models/user-action-stat.js
similarity index 100%
rename from app/assets/javascripts/discourse/models/user-action-stat.js.es6
rename to app/assets/javascripts/discourse/models/user-action-stat.js
diff --git a/app/assets/javascripts/discourse/models/user-action.js.es6 b/app/assets/javascripts/discourse/models/user-action.js
similarity index 100%
rename from app/assets/javascripts/discourse/models/user-action.js.es6
rename to app/assets/javascripts/discourse/models/user-action.js
diff --git a/app/assets/javascripts/discourse/models/user-badge.js.es6 b/app/assets/javascripts/discourse/models/user-badge.js
similarity index 100%
rename from app/assets/javascripts/discourse/models/user-badge.js.es6
rename to app/assets/javascripts/discourse/models/user-badge.js
diff --git a/app/assets/javascripts/discourse/models/user-draft.js.es6 b/app/assets/javascripts/discourse/models/user-draft.js
similarity index 100%
rename from app/assets/javascripts/discourse/models/user-draft.js.es6
rename to app/assets/javascripts/discourse/models/user-draft.js
diff --git a/app/assets/javascripts/discourse/models/user-drafts-stream.js.es6 b/app/assets/javascripts/discourse/models/user-drafts-stream.js
similarity index 100%
rename from app/assets/javascripts/discourse/models/user-drafts-stream.js.es6
rename to app/assets/javascripts/discourse/models/user-drafts-stream.js
diff --git a/app/assets/javascripts/discourse/models/user-posts-stream.js.es6 b/app/assets/javascripts/discourse/models/user-posts-stream.js
similarity index 100%
rename from app/assets/javascripts/discourse/models/user-posts-stream.js.es6
rename to app/assets/javascripts/discourse/models/user-posts-stream.js
diff --git a/app/assets/javascripts/discourse/models/user-stream.js.es6 b/app/assets/javascripts/discourse/models/user-stream.js
similarity index 100%
rename from app/assets/javascripts/discourse/models/user-stream.js.es6
rename to app/assets/javascripts/discourse/models/user-stream.js
diff --git a/app/assets/javascripts/discourse/models/user.js.es6 b/app/assets/javascripts/discourse/models/user.js
similarity index 100%
rename from app/assets/javascripts/discourse/models/user.js.es6
rename to app/assets/javascripts/discourse/models/user.js
diff --git a/app/assets/javascripts/discourse/pre-initializers/dynamic-route-builders.js.es6 b/app/assets/javascripts/discourse/pre-initializers/dynamic-route-builders.js
similarity index 100%
rename from app/assets/javascripts/discourse/pre-initializers/dynamic-route-builders.js.es6
rename to app/assets/javascripts/discourse/pre-initializers/dynamic-route-builders.js
diff --git a/app/assets/javascripts/discourse/pre-initializers/inject-discourse-objects.js.es6 b/app/assets/javascripts/discourse/pre-initializers/inject-discourse-objects.js
similarity index 100%
rename from app/assets/javascripts/discourse/pre-initializers/inject-discourse-objects.js.es6
rename to app/assets/javascripts/discourse/pre-initializers/inject-discourse-objects.js
diff --git a/app/assets/javascripts/discourse/pre-initializers/map-routes.js.es6 b/app/assets/javascripts/discourse/pre-initializers/map-routes.js
similarity index 100%
rename from app/assets/javascripts/discourse/pre-initializers/map-routes.js.es6
rename to app/assets/javascripts/discourse/pre-initializers/map-routes.js
diff --git a/app/assets/javascripts/discourse/pre-initializers/register-dom-templates.js.es6 b/app/assets/javascripts/discourse/pre-initializers/register-dom-templates.js
similarity index 100%
rename from app/assets/javascripts/discourse/pre-initializers/register-dom-templates.js.es6
rename to app/assets/javascripts/discourse/pre-initializers/register-dom-templates.js
diff --git a/app/assets/javascripts/discourse/pre-initializers/sniff-capabilities.js.es6 b/app/assets/javascripts/discourse/pre-initializers/sniff-capabilities.js
similarity index 100%
rename from app/assets/javascripts/discourse/pre-initializers/sniff-capabilities.js.es6
rename to app/assets/javascripts/discourse/pre-initializers/sniff-capabilities.js
diff --git a/app/assets/javascripts/discourse/pre-initializers/svg-sprite-fontawesome.js.es6 b/app/assets/javascripts/discourse/pre-initializers/svg-sprite-fontawesome.js
similarity index 100%
rename from app/assets/javascripts/discourse/pre-initializers/svg-sprite-fontawesome.js.es6
rename to app/assets/javascripts/discourse/pre-initializers/svg-sprite-fontawesome.js
diff --git a/app/assets/javascripts/discourse/raw-views/list/post-count-or-badges.js.es6 b/app/assets/javascripts/discourse/raw-views/list/post-count-or-badges.js
similarity index 100%
rename from app/assets/javascripts/discourse/raw-views/list/post-count-or-badges.js.es6
rename to app/assets/javascripts/discourse/raw-views/list/post-count-or-badges.js
diff --git a/app/assets/javascripts/discourse/raw-views/list/posts-count-column.js.es6 b/app/assets/javascripts/discourse/raw-views/list/posts-count-column.js
similarity index 100%
rename from app/assets/javascripts/discourse/raw-views/list/posts-count-column.js.es6
rename to app/assets/javascripts/discourse/raw-views/list/posts-count-column.js
diff --git a/app/assets/javascripts/discourse/raw-views/list/visited-line.js.es6 b/app/assets/javascripts/discourse/raw-views/list/visited-line.js
similarity index 100%
rename from app/assets/javascripts/discourse/raw-views/list/visited-line.js.es6
rename to app/assets/javascripts/discourse/raw-views/list/visited-line.js
diff --git a/app/assets/javascripts/discourse/raw-views/topic-list-header-column.js.es6 b/app/assets/javascripts/discourse/raw-views/topic-list-header-column.js
similarity index 100%
rename from app/assets/javascripts/discourse/raw-views/topic-list-header-column.js.es6
rename to app/assets/javascripts/discourse/raw-views/topic-list-header-column.js
diff --git a/app/assets/javascripts/discourse/raw-views/topic-status.js.es6 b/app/assets/javascripts/discourse/raw-views/topic-status.js
similarity index 100%
rename from app/assets/javascripts/discourse/raw-views/topic-status.js.es6
rename to app/assets/javascripts/discourse/raw-views/topic-status.js
diff --git a/app/assets/javascripts/discourse/routes/about.js.es6 b/app/assets/javascripts/discourse/routes/about.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/about.js.es6
rename to app/assets/javascripts/discourse/routes/about.js
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
similarity index 100%
rename from app/assets/javascripts/discourse/routes/account-created-edit-email.js.es6
rename to app/assets/javascripts/discourse/routes/account-created-edit-email.js
diff --git a/app/assets/javascripts/discourse/routes/account-created-index.js.es6 b/app/assets/javascripts/discourse/routes/account-created-index.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/account-created-index.js.es6
rename to app/assets/javascripts/discourse/routes/account-created-index.js
diff --git a/app/assets/javascripts/discourse/routes/account-created-resent.js.es6 b/app/assets/javascripts/discourse/routes/account-created-resent.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/account-created-resent.js.es6
rename to app/assets/javascripts/discourse/routes/account-created-resent.js
diff --git a/app/assets/javascripts/discourse/routes/account-created.js.es6 b/app/assets/javascripts/discourse/routes/account-created.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/account-created.js.es6
rename to app/assets/javascripts/discourse/routes/account-created.js
diff --git a/app/assets/javascripts/discourse/routes/app-route-map.js.es6 b/app/assets/javascripts/discourse/routes/app-route-map.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/app-route-map.js.es6
rename to app/assets/javascripts/discourse/routes/app-route-map.js
diff --git a/app/assets/javascripts/discourse/routes/application.js.es6 b/app/assets/javascripts/discourse/routes/application.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/application.js.es6
rename to app/assets/javascripts/discourse/routes/application.js
diff --git a/app/assets/javascripts/discourse/routes/associate-account.js.es6 b/app/assets/javascripts/discourse/routes/associate-account.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/associate-account.js.es6
rename to app/assets/javascripts/discourse/routes/associate-account.js
diff --git a/app/assets/javascripts/discourse/routes/badges-index.js.es6 b/app/assets/javascripts/discourse/routes/badges-index.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/badges-index.js.es6
rename to app/assets/javascripts/discourse/routes/badges-index.js
diff --git a/app/assets/javascripts/discourse/routes/badges-show.js.es6 b/app/assets/javascripts/discourse/routes/badges-show.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/badges-show.js.es6
rename to app/assets/javascripts/discourse/routes/badges-show.js
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
similarity index 100%
rename from app/assets/javascripts/discourse/routes/build-admin-user-posts-route.js.es6
rename to app/assets/javascripts/discourse/routes/build-admin-user-posts-route.js
diff --git a/app/assets/javascripts/discourse/routes/build-category-route.js.es6 b/app/assets/javascripts/discourse/routes/build-category-route.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/build-category-route.js.es6
rename to app/assets/javascripts/discourse/routes/build-category-route.js
diff --git a/app/assets/javascripts/discourse/routes/build-group-messages-route.js.es6 b/app/assets/javascripts/discourse/routes/build-group-messages-route.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/build-group-messages-route.js.es6
rename to app/assets/javascripts/discourse/routes/build-group-messages-route.js
diff --git a/app/assets/javascripts/discourse/routes/build-private-messages-route.js.es6 b/app/assets/javascripts/discourse/routes/build-private-messages-route.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/build-private-messages-route.js.es6
rename to app/assets/javascripts/discourse/routes/build-private-messages-route.js
diff --git a/app/assets/javascripts/discourse/routes/build-static-route.js.es6 b/app/assets/javascripts/discourse/routes/build-static-route.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/build-static-route.js.es6
rename to app/assets/javascripts/discourse/routes/build-static-route.js
diff --git a/app/assets/javascripts/discourse/routes/build-topic-route.js.es6 b/app/assets/javascripts/discourse/routes/build-topic-route.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/build-topic-route.js.es6
rename to app/assets/javascripts/discourse/routes/build-topic-route.js
diff --git a/app/assets/javascripts/discourse/routes/conduct.js.es6 b/app/assets/javascripts/discourse/routes/conduct.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/conduct.js.es6
rename to app/assets/javascripts/discourse/routes/conduct.js
diff --git a/app/assets/javascripts/discourse/routes/discourse.js.es6 b/app/assets/javascripts/discourse/routes/discourse.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/discourse.js.es6
rename to app/assets/javascripts/discourse/routes/discourse.js
diff --git a/app/assets/javascripts/discourse/routes/discovery-categories.js.es6 b/app/assets/javascripts/discourse/routes/discovery-categories.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/discovery-categories.js.es6
rename to app/assets/javascripts/discourse/routes/discovery-categories.js
diff --git a/app/assets/javascripts/discourse/routes/discovery.js.es6 b/app/assets/javascripts/discourse/routes/discovery.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/discovery.js.es6
rename to app/assets/javascripts/discourse/routes/discovery.js
diff --git a/app/assets/javascripts/discourse/routes/email-login.js.es6 b/app/assets/javascripts/discourse/routes/email-login.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/email-login.js.es6
rename to app/assets/javascripts/discourse/routes/email-login.js
diff --git a/app/assets/javascripts/discourse/routes/exception-unknown.js.es6 b/app/assets/javascripts/discourse/routes/exception-unknown.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/exception-unknown.js.es6
rename to app/assets/javascripts/discourse/routes/exception-unknown.js
diff --git a/app/assets/javascripts/discourse/routes/exception.js.es6 b/app/assets/javascripts/discourse/routes/exception.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/exception.js.es6
rename to app/assets/javascripts/discourse/routes/exception.js
diff --git a/app/assets/javascripts/discourse/routes/faq.js.es6 b/app/assets/javascripts/discourse/routes/faq.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/faq.js.es6
rename to app/assets/javascripts/discourse/routes/faq.js
diff --git a/app/assets/javascripts/discourse/routes/forgot-password.js.es6 b/app/assets/javascripts/discourse/routes/forgot-password.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/forgot-password.js.es6
rename to app/assets/javascripts/discourse/routes/forgot-password.js
diff --git a/app/assets/javascripts/discourse/routes/full-page-search.js.es6 b/app/assets/javascripts/discourse/routes/full-page-search.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/full-page-search.js.es6
rename to app/assets/javascripts/discourse/routes/full-page-search.js
diff --git a/app/assets/javascripts/discourse/routes/group-activity-index.js.es6 b/app/assets/javascripts/discourse/routes/group-activity-index.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/group-activity-index.js.es6
rename to app/assets/javascripts/discourse/routes/group-activity-index.js
diff --git a/app/assets/javascripts/discourse/routes/group-activity-mentions.js.es6 b/app/assets/javascripts/discourse/routes/group-activity-mentions.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/group-activity-mentions.js.es6
rename to app/assets/javascripts/discourse/routes/group-activity-mentions.js
diff --git a/app/assets/javascripts/discourse/routes/group-activity-posts.js.es6 b/app/assets/javascripts/discourse/routes/group-activity-posts.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/group-activity-posts.js.es6
rename to app/assets/javascripts/discourse/routes/group-activity-posts.js
diff --git a/app/assets/javascripts/discourse/routes/group-activity-topics.js.es6 b/app/assets/javascripts/discourse/routes/group-activity-topics.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/group-activity-topics.js.es6
rename to app/assets/javascripts/discourse/routes/group-activity-topics.js
diff --git a/app/assets/javascripts/discourse/routes/group-index.js.es6 b/app/assets/javascripts/discourse/routes/group-index.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/group-index.js.es6
rename to app/assets/javascripts/discourse/routes/group-index.js
diff --git a/app/assets/javascripts/discourse/routes/group-manage-index.js.es6 b/app/assets/javascripts/discourse/routes/group-manage-index.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/group-manage-index.js.es6
rename to app/assets/javascripts/discourse/routes/group-manage-index.js
diff --git a/app/assets/javascripts/discourse/routes/group-manage-interaction.js.es6 b/app/assets/javascripts/discourse/routes/group-manage-interaction.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/group-manage-interaction.js.es6
rename to app/assets/javascripts/discourse/routes/group-manage-interaction.js
diff --git a/app/assets/javascripts/discourse/routes/group-manage-logs.js.es6 b/app/assets/javascripts/discourse/routes/group-manage-logs.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/group-manage-logs.js.es6
rename to app/assets/javascripts/discourse/routes/group-manage-logs.js
diff --git a/app/assets/javascripts/discourse/routes/group-manage-membership.js.es6 b/app/assets/javascripts/discourse/routes/group-manage-membership.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/group-manage-membership.js.es6
rename to app/assets/javascripts/discourse/routes/group-manage-membership.js
diff --git a/app/assets/javascripts/discourse/routes/group-manage-profile.js.es6 b/app/assets/javascripts/discourse/routes/group-manage-profile.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/group-manage-profile.js.es6
rename to app/assets/javascripts/discourse/routes/group-manage-profile.js
diff --git a/app/assets/javascripts/discourse/routes/group-manage.js.es6 b/app/assets/javascripts/discourse/routes/group-manage.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/group-manage.js.es6
rename to app/assets/javascripts/discourse/routes/group-manage.js
diff --git a/app/assets/javascripts/discourse/routes/group-members.js.es6 b/app/assets/javascripts/discourse/routes/group-members.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/group-members.js.es6
rename to app/assets/javascripts/discourse/routes/group-members.js
diff --git a/app/assets/javascripts/discourse/routes/group-messages-archive.js.es6 b/app/assets/javascripts/discourse/routes/group-messages-archive.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/group-messages-archive.js.es6
rename to app/assets/javascripts/discourse/routes/group-messages-archive.js
diff --git a/app/assets/javascripts/discourse/routes/group-messages-inbox.js.es6 b/app/assets/javascripts/discourse/routes/group-messages-inbox.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/group-messages-inbox.js.es6
rename to app/assets/javascripts/discourse/routes/group-messages-inbox.js
diff --git a/app/assets/javascripts/discourse/routes/group-messages-index.js.es6 b/app/assets/javascripts/discourse/routes/group-messages-index.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/group-messages-index.js.es6
rename to app/assets/javascripts/discourse/routes/group-messages-index.js
diff --git a/app/assets/javascripts/discourse/routes/group-messages.js.es6 b/app/assets/javascripts/discourse/routes/group-messages.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/group-messages.js.es6
rename to app/assets/javascripts/discourse/routes/group-messages.js
diff --git a/app/assets/javascripts/discourse/routes/group-requests.js.es6 b/app/assets/javascripts/discourse/routes/group-requests.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/group-requests.js.es6
rename to app/assets/javascripts/discourse/routes/group-requests.js
diff --git a/app/assets/javascripts/discourse/routes/group.js.es6 b/app/assets/javascripts/discourse/routes/group.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/group.js.es6
rename to app/assets/javascripts/discourse/routes/group.js
diff --git a/app/assets/javascripts/discourse/routes/groups-index.js.es6 b/app/assets/javascripts/discourse/routes/groups-index.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/groups-index.js.es6
rename to app/assets/javascripts/discourse/routes/groups-index.js
diff --git a/app/assets/javascripts/discourse/routes/groups-new.js.es6 b/app/assets/javascripts/discourse/routes/groups-new.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/groups-new.js.es6
rename to app/assets/javascripts/discourse/routes/groups-new.js
diff --git a/app/assets/javascripts/discourse/routes/guidelines.js.es6 b/app/assets/javascripts/discourse/routes/guidelines.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/guidelines.js.es6
rename to app/assets/javascripts/discourse/routes/guidelines.js
diff --git a/app/assets/javascripts/discourse/routes/invites-show.js.es6 b/app/assets/javascripts/discourse/routes/invites-show.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/invites-show.js.es6
rename to app/assets/javascripts/discourse/routes/invites-show.js
diff --git a/app/assets/javascripts/discourse/routes/login.js.es6 b/app/assets/javascripts/discourse/routes/login.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/login.js.es6
rename to app/assets/javascripts/discourse/routes/login.js
diff --git a/app/assets/javascripts/discourse/routes/new-message.js.es6 b/app/assets/javascripts/discourse/routes/new-message.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/new-message.js.es6
rename to app/assets/javascripts/discourse/routes/new-message.js
diff --git a/app/assets/javascripts/discourse/routes/new-topic.js.es6 b/app/assets/javascripts/discourse/routes/new-topic.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/new-topic.js.es6
rename to app/assets/javascripts/discourse/routes/new-topic.js
diff --git a/app/assets/javascripts/discourse/routes/password-reset.js.es6 b/app/assets/javascripts/discourse/routes/password-reset.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/password-reset.js.es6
rename to app/assets/javascripts/discourse/routes/password-reset.js
diff --git a/app/assets/javascripts/discourse/routes/post.js.es6 b/app/assets/javascripts/discourse/routes/post.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/post.js.es6
rename to app/assets/javascripts/discourse/routes/post.js
diff --git a/app/assets/javascripts/discourse/routes/preferences-account.js.es6 b/app/assets/javascripts/discourse/routes/preferences-account.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/preferences-account.js.es6
rename to app/assets/javascripts/discourse/routes/preferences-account.js
diff --git a/app/assets/javascripts/discourse/routes/preferences-apps.js.es6 b/app/assets/javascripts/discourse/routes/preferences-apps.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/preferences-apps.js.es6
rename to app/assets/javascripts/discourse/routes/preferences-apps.js
diff --git a/app/assets/javascripts/discourse/routes/preferences-categories.js.es6 b/app/assets/javascripts/discourse/routes/preferences-categories.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/preferences-categories.js.es6
rename to app/assets/javascripts/discourse/routes/preferences-categories.js
diff --git a/app/assets/javascripts/discourse/routes/preferences-email.js.es6 b/app/assets/javascripts/discourse/routes/preferences-email.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/preferences-email.js.es6
rename to app/assets/javascripts/discourse/routes/preferences-email.js
diff --git a/app/assets/javascripts/discourse/routes/preferences-emails.js.es6 b/app/assets/javascripts/discourse/routes/preferences-emails.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/preferences-emails.js.es6
rename to app/assets/javascripts/discourse/routes/preferences-emails.js
diff --git a/app/assets/javascripts/discourse/routes/preferences-index.js.es6 b/app/assets/javascripts/discourse/routes/preferences-index.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/preferences-index.js.es6
rename to app/assets/javascripts/discourse/routes/preferences-index.js
diff --git a/app/assets/javascripts/discourse/routes/preferences-interface.js.es6 b/app/assets/javascripts/discourse/routes/preferences-interface.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/preferences-interface.js.es6
rename to app/assets/javascripts/discourse/routes/preferences-interface.js
diff --git a/app/assets/javascripts/discourse/routes/preferences-notifications.js.es6 b/app/assets/javascripts/discourse/routes/preferences-notifications.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/preferences-notifications.js.es6
rename to app/assets/javascripts/discourse/routes/preferences-notifications.js
diff --git a/app/assets/javascripts/discourse/routes/preferences-profile.js.es6 b/app/assets/javascripts/discourse/routes/preferences-profile.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/preferences-profile.js.es6
rename to app/assets/javascripts/discourse/routes/preferences-profile.js
diff --git a/app/assets/javascripts/discourse/routes/preferences-second-factor.js.es6 b/app/assets/javascripts/discourse/routes/preferences-second-factor.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/preferences-second-factor.js.es6
rename to app/assets/javascripts/discourse/routes/preferences-second-factor.js
diff --git a/app/assets/javascripts/discourse/routes/preferences-tags.js.es6 b/app/assets/javascripts/discourse/routes/preferences-tags.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/preferences-tags.js.es6
rename to app/assets/javascripts/discourse/routes/preferences-tags.js
diff --git a/app/assets/javascripts/discourse/routes/preferences-username.js.es6 b/app/assets/javascripts/discourse/routes/preferences-username.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/preferences-username.js.es6
rename to app/assets/javascripts/discourse/routes/preferences-username.js
diff --git a/app/assets/javascripts/discourse/routes/preferences-users.js.es6 b/app/assets/javascripts/discourse/routes/preferences-users.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/preferences-users.js.es6
rename to app/assets/javascripts/discourse/routes/preferences-users.js
diff --git a/app/assets/javascripts/discourse/routes/preferences.js.es6 b/app/assets/javascripts/discourse/routes/preferences.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/preferences.js.es6
rename to app/assets/javascripts/discourse/routes/preferences.js
diff --git a/app/assets/javascripts/discourse/routes/privacy.js.es6 b/app/assets/javascripts/discourse/routes/privacy.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/privacy.js.es6
rename to app/assets/javascripts/discourse/routes/privacy.js
diff --git a/app/assets/javascripts/discourse/routes/restricted-user.js.es6 b/app/assets/javascripts/discourse/routes/restricted-user.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/restricted-user.js.es6
rename to app/assets/javascripts/discourse/routes/restricted-user.js
diff --git a/app/assets/javascripts/discourse/routes/review-index.js.es6 b/app/assets/javascripts/discourse/routes/review-index.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/review-index.js.es6
rename to app/assets/javascripts/discourse/routes/review-index.js
diff --git a/app/assets/javascripts/discourse/routes/review-settings.js.es6 b/app/assets/javascripts/discourse/routes/review-settings.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/review-settings.js.es6
rename to app/assets/javascripts/discourse/routes/review-settings.js
diff --git a/app/assets/javascripts/discourse/routes/review-show.js.es6 b/app/assets/javascripts/discourse/routes/review-show.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/review-show.js.es6
rename to app/assets/javascripts/discourse/routes/review-show.js
diff --git a/app/assets/javascripts/discourse/routes/review-topics.js.es6 b/app/assets/javascripts/discourse/routes/review-topics.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/review-topics.js.es6
rename to app/assets/javascripts/discourse/routes/review-topics.js
diff --git a/app/assets/javascripts/discourse/routes/review.js.es6 b/app/assets/javascripts/discourse/routes/review.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/review.js.es6
rename to app/assets/javascripts/discourse/routes/review.js
diff --git a/app/assets/javascripts/discourse/routes/rules.js.es6 b/app/assets/javascripts/discourse/routes/rules.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/rules.js.es6
rename to app/assets/javascripts/discourse/routes/rules.js
diff --git a/app/assets/javascripts/discourse/routes/signup.js.es6 b/app/assets/javascripts/discourse/routes/signup.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/signup.js.es6
rename to app/assets/javascripts/discourse/routes/signup.js
diff --git a/app/assets/javascripts/discourse/routes/tag-groups-edit.js.es6 b/app/assets/javascripts/discourse/routes/tag-groups-edit.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/tag-groups-edit.js.es6
rename to app/assets/javascripts/discourse/routes/tag-groups-edit.js
diff --git a/app/assets/javascripts/discourse/routes/tag-groups-new.js.es6 b/app/assets/javascripts/discourse/routes/tag-groups-new.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/tag-groups-new.js.es6
rename to app/assets/javascripts/discourse/routes/tag-groups-new.js
diff --git a/app/assets/javascripts/discourse/routes/tag-groups.js.es6 b/app/assets/javascripts/discourse/routes/tag-groups.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/tag-groups.js.es6
rename to app/assets/javascripts/discourse/routes/tag-groups.js
diff --git a/app/assets/javascripts/discourse/routes/tags-index.js.es6 b/app/assets/javascripts/discourse/routes/tags-index.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/tags-index.js.es6
rename to app/assets/javascripts/discourse/routes/tags-index.js
diff --git a/app/assets/javascripts/discourse/routes/tags-intersection.js.es6 b/app/assets/javascripts/discourse/routes/tags-intersection.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/tags-intersection.js.es6
rename to app/assets/javascripts/discourse/routes/tags-intersection.js
diff --git a/app/assets/javascripts/discourse/routes/tags-show.js.es6 b/app/assets/javascripts/discourse/routes/tags-show.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/tags-show.js.es6
rename to app/assets/javascripts/discourse/routes/tags-show.js
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
similarity index 100%
rename from app/assets/javascripts/discourse/routes/topic-by-slug-or-id.js.es6
rename to app/assets/javascripts/discourse/routes/topic-by-slug-or-id.js
diff --git a/app/assets/javascripts/discourse/routes/topic-from-params-near.js.es6 b/app/assets/javascripts/discourse/routes/topic-from-params-near.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/topic-from-params-near.js.es6
rename to app/assets/javascripts/discourse/routes/topic-from-params-near.js
diff --git a/app/assets/javascripts/discourse/routes/topic-from-params.js.es6 b/app/assets/javascripts/discourse/routes/topic-from-params.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/topic-from-params.js.es6
rename to app/assets/javascripts/discourse/routes/topic-from-params.js
diff --git a/app/assets/javascripts/discourse/routes/topic.js.es6 b/app/assets/javascripts/discourse/routes/topic.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/topic.js.es6
rename to app/assets/javascripts/discourse/routes/topic.js
diff --git a/app/assets/javascripts/discourse/routes/tos.js.es6 b/app/assets/javascripts/discourse/routes/tos.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/tos.js.es6
rename to app/assets/javascripts/discourse/routes/tos.js
diff --git a/app/assets/javascripts/discourse/routes/unknown.js.es6 b/app/assets/javascripts/discourse/routes/unknown.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/unknown.js.es6
rename to app/assets/javascripts/discourse/routes/unknown.js
diff --git a/app/assets/javascripts/discourse/routes/user-activity-bookmarks-with-reminders.js.es6 b/app/assets/javascripts/discourse/routes/user-activity-bookmarks-with-reminders.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/user-activity-bookmarks-with-reminders.js.es6
rename to app/assets/javascripts/discourse/routes/user-activity-bookmarks-with-reminders.js
diff --git a/app/assets/javascripts/discourse/routes/user-activity-bookmarks.js.es6 b/app/assets/javascripts/discourse/routes/user-activity-bookmarks.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/user-activity-bookmarks.js.es6
rename to app/assets/javascripts/discourse/routes/user-activity-bookmarks.js
diff --git a/app/assets/javascripts/discourse/routes/user-activity-drafts.js.es6 b/app/assets/javascripts/discourse/routes/user-activity-drafts.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/user-activity-drafts.js.es6
rename to app/assets/javascripts/discourse/routes/user-activity-drafts.js
diff --git a/app/assets/javascripts/discourse/routes/user-activity-index.js.es6 b/app/assets/javascripts/discourse/routes/user-activity-index.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/user-activity-index.js.es6
rename to app/assets/javascripts/discourse/routes/user-activity-index.js
diff --git a/app/assets/javascripts/discourse/routes/user-activity-likes-given.js.es6 b/app/assets/javascripts/discourse/routes/user-activity-likes-given.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/user-activity-likes-given.js.es6
rename to app/assets/javascripts/discourse/routes/user-activity-likes-given.js
diff --git a/app/assets/javascripts/discourse/routes/user-activity-pending.js.es6 b/app/assets/javascripts/discourse/routes/user-activity-pending.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/user-activity-pending.js.es6
rename to app/assets/javascripts/discourse/routes/user-activity-pending.js
diff --git a/app/assets/javascripts/discourse/routes/user-activity-replies.js.es6 b/app/assets/javascripts/discourse/routes/user-activity-replies.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/user-activity-replies.js.es6
rename to app/assets/javascripts/discourse/routes/user-activity-replies.js
diff --git a/app/assets/javascripts/discourse/routes/user-activity-stream.js.es6 b/app/assets/javascripts/discourse/routes/user-activity-stream.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/user-activity-stream.js.es6
rename to app/assets/javascripts/discourse/routes/user-activity-stream.js
diff --git a/app/assets/javascripts/discourse/routes/user-activity-topics.js.es6 b/app/assets/javascripts/discourse/routes/user-activity-topics.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/user-activity-topics.js.es6
rename to app/assets/javascripts/discourse/routes/user-activity-topics.js
diff --git a/app/assets/javascripts/discourse/routes/user-activity.js.es6 b/app/assets/javascripts/discourse/routes/user-activity.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/user-activity.js.es6
rename to app/assets/javascripts/discourse/routes/user-activity.js
diff --git a/app/assets/javascripts/discourse/routes/user-badges.js.es6 b/app/assets/javascripts/discourse/routes/user-badges.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/user-badges.js.es6
rename to app/assets/javascripts/discourse/routes/user-badges.js
diff --git a/app/assets/javascripts/discourse/routes/user-deleted-posts.js.es6 b/app/assets/javascripts/discourse/routes/user-deleted-posts.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/user-deleted-posts.js.es6
rename to app/assets/javascripts/discourse/routes/user-deleted-posts.js
diff --git a/app/assets/javascripts/discourse/routes/user-index.js.es6 b/app/assets/javascripts/discourse/routes/user-index.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/user-index.js.es6
rename to app/assets/javascripts/discourse/routes/user-index.js
diff --git a/app/assets/javascripts/discourse/routes/user-invited-index.js.es6 b/app/assets/javascripts/discourse/routes/user-invited-index.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/user-invited-index.js.es6
rename to app/assets/javascripts/discourse/routes/user-invited-index.js
diff --git a/app/assets/javascripts/discourse/routes/user-invited-show.js.es6 b/app/assets/javascripts/discourse/routes/user-invited-show.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/user-invited-show.js.es6
rename to app/assets/javascripts/discourse/routes/user-invited-show.js
diff --git a/app/assets/javascripts/discourse/routes/user-notifications-edits.js.es6 b/app/assets/javascripts/discourse/routes/user-notifications-edits.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/user-notifications-edits.js.es6
rename to app/assets/javascripts/discourse/routes/user-notifications-edits.js
diff --git a/app/assets/javascripts/discourse/routes/user-notifications-index.js.es6 b/app/assets/javascripts/discourse/routes/user-notifications-index.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/user-notifications-index.js.es6
rename to app/assets/javascripts/discourse/routes/user-notifications-index.js
diff --git a/app/assets/javascripts/discourse/routes/user-notifications-likes-received.js.es6 b/app/assets/javascripts/discourse/routes/user-notifications-likes-received.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/user-notifications-likes-received.js.es6
rename to app/assets/javascripts/discourse/routes/user-notifications-likes-received.js
diff --git a/app/assets/javascripts/discourse/routes/user-notifications-mentions.js.es6 b/app/assets/javascripts/discourse/routes/user-notifications-mentions.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/user-notifications-mentions.js.es6
rename to app/assets/javascripts/discourse/routes/user-notifications-mentions.js
diff --git a/app/assets/javascripts/discourse/routes/user-notifications-responses.js.es6 b/app/assets/javascripts/discourse/routes/user-notifications-responses.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/user-notifications-responses.js.es6
rename to app/assets/javascripts/discourse/routes/user-notifications-responses.js
diff --git a/app/assets/javascripts/discourse/routes/user-notifications.js.es6 b/app/assets/javascripts/discourse/routes/user-notifications.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/user-notifications.js.es6
rename to app/assets/javascripts/discourse/routes/user-notifications.js
diff --git a/app/assets/javascripts/discourse/routes/user-private-messages-archive.js.es6 b/app/assets/javascripts/discourse/routes/user-private-messages-archive.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/user-private-messages-archive.js.es6
rename to app/assets/javascripts/discourse/routes/user-private-messages-archive.js
diff --git a/app/assets/javascripts/discourse/routes/user-private-messages-group-archive.js.es6 b/app/assets/javascripts/discourse/routes/user-private-messages-group-archive.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/user-private-messages-group-archive.js.es6
rename to app/assets/javascripts/discourse/routes/user-private-messages-group-archive.js
diff --git a/app/assets/javascripts/discourse/routes/user-private-messages-group.js.es6 b/app/assets/javascripts/discourse/routes/user-private-messages-group.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/user-private-messages-group.js.es6
rename to app/assets/javascripts/discourse/routes/user-private-messages-group.js
diff --git a/app/assets/javascripts/discourse/routes/user-private-messages-index.js.es6 b/app/assets/javascripts/discourse/routes/user-private-messages-index.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/user-private-messages-index.js.es6
rename to app/assets/javascripts/discourse/routes/user-private-messages-index.js
diff --git a/app/assets/javascripts/discourse/routes/user-private-messages-sent.js.es6 b/app/assets/javascripts/discourse/routes/user-private-messages-sent.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/user-private-messages-sent.js.es6
rename to app/assets/javascripts/discourse/routes/user-private-messages-sent.js
diff --git a/app/assets/javascripts/discourse/routes/user-private-messages-tags-show.js.es6 b/app/assets/javascripts/discourse/routes/user-private-messages-tags-show.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/user-private-messages-tags-show.js.es6
rename to app/assets/javascripts/discourse/routes/user-private-messages-tags-show.js
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
similarity index 100%
rename from app/assets/javascripts/discourse/routes/user-private-messages-tags.js.es6
rename to app/assets/javascripts/discourse/routes/user-private-messages-tags.js
diff --git a/app/assets/javascripts/discourse/routes/user-private-messages.js.es6 b/app/assets/javascripts/discourse/routes/user-private-messages.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/user-private-messages.js.es6
rename to app/assets/javascripts/discourse/routes/user-private-messages.js
diff --git a/app/assets/javascripts/discourse/routes/user-summary.js.es6 b/app/assets/javascripts/discourse/routes/user-summary.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/user-summary.js.es6
rename to app/assets/javascripts/discourse/routes/user-summary.js
diff --git a/app/assets/javascripts/discourse/routes/user-topic-list.js.es6 b/app/assets/javascripts/discourse/routes/user-topic-list.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/user-topic-list.js.es6
rename to app/assets/javascripts/discourse/routes/user-topic-list.js
diff --git a/app/assets/javascripts/discourse/routes/user.js.es6 b/app/assets/javascripts/discourse/routes/user.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/user.js.es6
rename to app/assets/javascripts/discourse/routes/user.js
diff --git a/app/assets/javascripts/discourse/routes/users.js.es6 b/app/assets/javascripts/discourse/routes/users.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/users.js.es6
rename to app/assets/javascripts/discourse/routes/users.js
diff --git a/app/assets/javascripts/discourse/services/app-events.js.es6 b/app/assets/javascripts/discourse/services/app-events.js
similarity index 100%
rename from app/assets/javascripts/discourse/services/app-events.js.es6
rename to app/assets/javascripts/discourse/services/app-events.js
diff --git a/app/assets/javascripts/discourse/services/emoji-store.js.es6 b/app/assets/javascripts/discourse/services/emoji-store.js
similarity index 100%
rename from app/assets/javascripts/discourse/services/emoji-store.js.es6
rename to app/assets/javascripts/discourse/services/emoji-store.js
diff --git a/app/assets/javascripts/discourse/services/logs-notice.js.es6 b/app/assets/javascripts/discourse/services/logs-notice.js
similarity index 100%
rename from app/assets/javascripts/discourse/services/logs-notice.js.es6
rename to app/assets/javascripts/discourse/services/logs-notice.js
diff --git a/app/assets/javascripts/discourse/services/search.js.es6 b/app/assets/javascripts/discourse/services/search.js
similarity index 100%
rename from app/assets/javascripts/discourse/services/search.js.es6
rename to app/assets/javascripts/discourse/services/search.js
diff --git a/app/assets/javascripts/discourse/services/theme-settings.js.es6 b/app/assets/javascripts/discourse/services/theme-settings.js
similarity index 100%
rename from app/assets/javascripts/discourse/services/theme-settings.js.es6
rename to app/assets/javascripts/discourse/services/theme-settings.js
diff --git a/app/assets/javascripts/discourse/templates/components/reviewable-score.js.es6 b/app/assets/javascripts/discourse/templates/components/reviewable-score.js
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/reviewable-score.js.es6
rename to app/assets/javascripts/discourse/templates/components/reviewable-score.js
diff --git a/app/assets/javascripts/discourse/widgets/actions-summary.js.es6 b/app/assets/javascripts/discourse/widgets/actions-summary.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/actions-summary.js.es6
rename to app/assets/javascripts/discourse/widgets/actions-summary.js
diff --git a/app/assets/javascripts/discourse/widgets/avatar-flair.js.es6 b/app/assets/javascripts/discourse/widgets/avatar-flair.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/avatar-flair.js.es6
rename to app/assets/javascripts/discourse/widgets/avatar-flair.js
diff --git a/app/assets/javascripts/discourse/widgets/bookmark-reminder-notification-item.js.es6 b/app/assets/javascripts/discourse/widgets/bookmark-reminder-notification-item.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/bookmark-reminder-notification-item.js.es6
rename to app/assets/javascripts/discourse/widgets/bookmark-reminder-notification-item.js
diff --git a/app/assets/javascripts/discourse/widgets/button.js.es6 b/app/assets/javascripts/discourse/widgets/button.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/button.js.es6
rename to app/assets/javascripts/discourse/widgets/button.js
diff --git a/app/assets/javascripts/discourse/widgets/category-link.js.es6 b/app/assets/javascripts/discourse/widgets/category-link.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/category-link.js.es6
rename to app/assets/javascripts/discourse/widgets/category-link.js
diff --git a/app/assets/javascripts/discourse/widgets/component-connector.js.es6 b/app/assets/javascripts/discourse/widgets/component-connector.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/component-connector.js.es6
rename to app/assets/javascripts/discourse/widgets/component-connector.js
diff --git a/app/assets/javascripts/discourse/widgets/connector.js.es6 b/app/assets/javascripts/discourse/widgets/connector.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/connector.js.es6
rename to app/assets/javascripts/discourse/widgets/connector.js
diff --git a/app/assets/javascripts/discourse/widgets/custom-notification-item.js.es6 b/app/assets/javascripts/discourse/widgets/custom-notification-item.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/custom-notification-item.js.es6
rename to app/assets/javascripts/discourse/widgets/custom-notification-item.js
diff --git a/app/assets/javascripts/discourse/widgets/decorator-helper.js.es6 b/app/assets/javascripts/discourse/widgets/decorator-helper.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/decorator-helper.js.es6
rename to app/assets/javascripts/discourse/widgets/decorator-helper.js
diff --git a/app/assets/javascripts/discourse/widgets/default-notification-item.js.es6 b/app/assets/javascripts/discourse/widgets/default-notification-item.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/default-notification-item.js.es6
rename to app/assets/javascripts/discourse/widgets/default-notification-item.js
diff --git a/app/assets/javascripts/discourse/widgets/discourse-tags.js.es6 b/app/assets/javascripts/discourse/widgets/discourse-tags.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/discourse-tags.js.es6
rename to app/assets/javascripts/discourse/widgets/discourse-tags.js
diff --git a/app/assets/javascripts/discourse/widgets/embedded-post.js.es6 b/app/assets/javascripts/discourse/widgets/embedded-post.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/embedded-post.js.es6
rename to app/assets/javascripts/discourse/widgets/embedded-post.js
diff --git a/app/assets/javascripts/discourse/widgets/emoji.js.es6 b/app/assets/javascripts/discourse/widgets/emoji.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/emoji.js.es6
rename to app/assets/javascripts/discourse/widgets/emoji.js
diff --git a/app/assets/javascripts/discourse/widgets/footer-nav.js.es6 b/app/assets/javascripts/discourse/widgets/footer-nav.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/footer-nav.js.es6
rename to app/assets/javascripts/discourse/widgets/footer-nav.js
diff --git a/app/assets/javascripts/discourse/widgets/glue.js.es6 b/app/assets/javascripts/discourse/widgets/glue.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/glue.js.es6
rename to app/assets/javascripts/discourse/widgets/glue.js
diff --git a/app/assets/javascripts/discourse/widgets/group-message-summary-notification-item.js.es6 b/app/assets/javascripts/discourse/widgets/group-message-summary-notification-item.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/group-message-summary-notification-item.js.es6
rename to app/assets/javascripts/discourse/widgets/group-message-summary-notification-item.js
diff --git a/app/assets/javascripts/discourse/widgets/hamburger-categories.js.es6 b/app/assets/javascripts/discourse/widgets/hamburger-categories.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/hamburger-categories.js.es6
rename to app/assets/javascripts/discourse/widgets/hamburger-categories.js
diff --git a/app/assets/javascripts/discourse/widgets/hamburger-menu.js.es6 b/app/assets/javascripts/discourse/widgets/hamburger-menu.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/hamburger-menu.js.es6
rename to app/assets/javascripts/discourse/widgets/hamburger-menu.js
diff --git a/app/assets/javascripts/discourse/widgets/hbs-compiler.js.es6 b/app/assets/javascripts/discourse/widgets/hbs-compiler.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/hbs-compiler.js.es6
rename to app/assets/javascripts/discourse/widgets/hbs-compiler.js
diff --git a/app/assets/javascripts/discourse/widgets/header-contents.js.es6 b/app/assets/javascripts/discourse/widgets/header-contents.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/header-contents.js.es6
rename to app/assets/javascripts/discourse/widgets/header-contents.js
diff --git a/app/assets/javascripts/discourse/widgets/header-topic-info.js.es6 b/app/assets/javascripts/discourse/widgets/header-topic-info.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/header-topic-info.js.es6
rename to app/assets/javascripts/discourse/widgets/header-topic-info.js
diff --git a/app/assets/javascripts/discourse/widgets/header.js.es6 b/app/assets/javascripts/discourse/widgets/header.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/header.js.es6
rename to app/assets/javascripts/discourse/widgets/header.js
diff --git a/app/assets/javascripts/discourse/widgets/home-logo.js.es6 b/app/assets/javascripts/discourse/widgets/home-logo.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/home-logo.js.es6
rename to app/assets/javascripts/discourse/widgets/home-logo.js
diff --git a/app/assets/javascripts/discourse/widgets/hooks.js.es6 b/app/assets/javascripts/discourse/widgets/hooks.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/hooks.js.es6
rename to app/assets/javascripts/discourse/widgets/hooks.js
diff --git a/app/assets/javascripts/discourse/widgets/invitee-accepted-notification-item.js.es6 b/app/assets/javascripts/discourse/widgets/invitee-accepted-notification-item.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/invitee-accepted-notification-item.js.es6
rename to app/assets/javascripts/discourse/widgets/invitee-accepted-notification-item.js
diff --git a/app/assets/javascripts/discourse/widgets/liked-consolidated-notification-item.js.es6 b/app/assets/javascripts/discourse/widgets/liked-consolidated-notification-item.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/liked-consolidated-notification-item.js.es6
rename to app/assets/javascripts/discourse/widgets/liked-consolidated-notification-item.js
diff --git a/app/assets/javascripts/discourse/widgets/liked-notification-item.js.es6 b/app/assets/javascripts/discourse/widgets/liked-notification-item.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/liked-notification-item.js.es6
rename to app/assets/javascripts/discourse/widgets/liked-notification-item.js
diff --git a/app/assets/javascripts/discourse/widgets/link.js.es6 b/app/assets/javascripts/discourse/widgets/link.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/link.js.es6
rename to app/assets/javascripts/discourse/widgets/link.js
diff --git a/app/assets/javascripts/discourse/widgets/membership-request-accepted-notification-item.js.es6 b/app/assets/javascripts/discourse/widgets/membership-request-accepted-notification-item.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/membership-request-accepted-notification-item.js.es6
rename to app/assets/javascripts/discourse/widgets/membership-request-accepted-notification-item.js
diff --git a/app/assets/javascripts/discourse/widgets/membership-request-consolidated-notification-item.js.es6 b/app/assets/javascripts/discourse/widgets/membership-request-consolidated-notification-item.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/membership-request-consolidated-notification-item.js.es6
rename to app/assets/javascripts/discourse/widgets/membership-request-consolidated-notification-item.js
diff --git a/app/assets/javascripts/discourse/widgets/menu-panel.js.es6 b/app/assets/javascripts/discourse/widgets/menu-panel.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/menu-panel.js.es6
rename to app/assets/javascripts/discourse/widgets/menu-panel.js
diff --git a/app/assets/javascripts/discourse/widgets/post-admin-menu.js.es6 b/app/assets/javascripts/discourse/widgets/post-admin-menu.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/post-admin-menu.js.es6
rename to app/assets/javascripts/discourse/widgets/post-admin-menu.js
diff --git a/app/assets/javascripts/discourse/widgets/post-cooked.js.es6 b/app/assets/javascripts/discourse/widgets/post-cooked.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/post-cooked.js.es6
rename to app/assets/javascripts/discourse/widgets/post-cooked.js
diff --git a/app/assets/javascripts/discourse/widgets/post-edits-indicator.js.es6 b/app/assets/javascripts/discourse/widgets/post-edits-indicator.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/post-edits-indicator.js.es6
rename to app/assets/javascripts/discourse/widgets/post-edits-indicator.js
diff --git a/app/assets/javascripts/discourse/widgets/post-gap.js.es6 b/app/assets/javascripts/discourse/widgets/post-gap.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/post-gap.js.es6
rename to app/assets/javascripts/discourse/widgets/post-gap.js
diff --git a/app/assets/javascripts/discourse/widgets/post-links.js.es6 b/app/assets/javascripts/discourse/widgets/post-links.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/post-links.js.es6
rename to app/assets/javascripts/discourse/widgets/post-links.js
diff --git a/app/assets/javascripts/discourse/widgets/post-menu.js.es6 b/app/assets/javascripts/discourse/widgets/post-menu.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/post-menu.js.es6
rename to app/assets/javascripts/discourse/widgets/post-menu.js
diff --git a/app/assets/javascripts/discourse/widgets/post-placeholder.js.es6 b/app/assets/javascripts/discourse/widgets/post-placeholder.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/post-placeholder.js.es6
rename to app/assets/javascripts/discourse/widgets/post-placeholder.js
diff --git a/app/assets/javascripts/discourse/widgets/post-small-action.js.es6 b/app/assets/javascripts/discourse/widgets/post-small-action.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/post-small-action.js.es6
rename to app/assets/javascripts/discourse/widgets/post-small-action.js
diff --git a/app/assets/javascripts/discourse/widgets/post-stream.js.es6 b/app/assets/javascripts/discourse/widgets/post-stream.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/post-stream.js.es6
rename to app/assets/javascripts/discourse/widgets/post-stream.js
diff --git a/app/assets/javascripts/discourse/widgets/post.js.es6 b/app/assets/javascripts/discourse/widgets/post.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/post.js.es6
rename to app/assets/javascripts/discourse/widgets/post.js
diff --git a/app/assets/javascripts/discourse/widgets/poster-name.js.es6 b/app/assets/javascripts/discourse/widgets/poster-name.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/poster-name.js.es6
rename to app/assets/javascripts/discourse/widgets/poster-name.js
diff --git a/app/assets/javascripts/discourse/widgets/private-message-map.js.es6 b/app/assets/javascripts/discourse/widgets/private-message-map.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/private-message-map.js.es6
rename to app/assets/javascripts/discourse/widgets/private-message-map.js
diff --git a/app/assets/javascripts/discourse/widgets/quick-access-bookmarks.js.es6 b/app/assets/javascripts/discourse/widgets/quick-access-bookmarks.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/quick-access-bookmarks.js.es6
rename to app/assets/javascripts/discourse/widgets/quick-access-bookmarks.js
diff --git a/app/assets/javascripts/discourse/widgets/quick-access-item.js.es6 b/app/assets/javascripts/discourse/widgets/quick-access-item.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/quick-access-item.js.es6
rename to app/assets/javascripts/discourse/widgets/quick-access-item.js
diff --git a/app/assets/javascripts/discourse/widgets/quick-access-messages.js.es6 b/app/assets/javascripts/discourse/widgets/quick-access-messages.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/quick-access-messages.js.es6
rename to app/assets/javascripts/discourse/widgets/quick-access-messages.js
diff --git a/app/assets/javascripts/discourse/widgets/quick-access-notifications.js.es6 b/app/assets/javascripts/discourse/widgets/quick-access-notifications.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/quick-access-notifications.js.es6
rename to app/assets/javascripts/discourse/widgets/quick-access-notifications.js
diff --git a/app/assets/javascripts/discourse/widgets/quick-access-panel.js.es6 b/app/assets/javascripts/discourse/widgets/quick-access-panel.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/quick-access-panel.js.es6
rename to app/assets/javascripts/discourse/widgets/quick-access-panel.js
diff --git a/app/assets/javascripts/discourse/widgets/quick-access-profile.js.es6 b/app/assets/javascripts/discourse/widgets/quick-access-profile.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/quick-access-profile.js.es6
rename to app/assets/javascripts/discourse/widgets/quick-access-profile.js
diff --git a/app/assets/javascripts/discourse/widgets/raw-html.js.es6 b/app/assets/javascripts/discourse/widgets/raw-html.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/raw-html.js.es6
rename to app/assets/javascripts/discourse/widgets/raw-html.js
diff --git a/app/assets/javascripts/discourse/widgets/search-menu-controls.js.es6 b/app/assets/javascripts/discourse/widgets/search-menu-controls.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/search-menu-controls.js.es6
rename to app/assets/javascripts/discourse/widgets/search-menu-controls.js
diff --git a/app/assets/javascripts/discourse/widgets/search-menu-results.js.es6 b/app/assets/javascripts/discourse/widgets/search-menu-results.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/search-menu-results.js.es6
rename to app/assets/javascripts/discourse/widgets/search-menu-results.js
diff --git a/app/assets/javascripts/discourse/widgets/search-menu.js.es6 b/app/assets/javascripts/discourse/widgets/search-menu.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/search-menu.js.es6
rename to app/assets/javascripts/discourse/widgets/search-menu.js
diff --git a/app/assets/javascripts/discourse/widgets/time-gap.js.es6 b/app/assets/javascripts/discourse/widgets/time-gap.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/time-gap.js.es6
rename to app/assets/javascripts/discourse/widgets/time-gap.js
diff --git a/app/assets/javascripts/discourse/widgets/toggle-topic-summary.js.es6 b/app/assets/javascripts/discourse/widgets/toggle-topic-summary.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/toggle-topic-summary.js.es6
rename to app/assets/javascripts/discourse/widgets/toggle-topic-summary.js
diff --git a/app/assets/javascripts/discourse/widgets/topic-admin-menu.js.es6 b/app/assets/javascripts/discourse/widgets/topic-admin-menu.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/topic-admin-menu.js.es6
rename to app/assets/javascripts/discourse/widgets/topic-admin-menu.js
diff --git a/app/assets/javascripts/discourse/widgets/topic-map.js.es6 b/app/assets/javascripts/discourse/widgets/topic-map.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/topic-map.js.es6
rename to app/assets/javascripts/discourse/widgets/topic-map.js
diff --git a/app/assets/javascripts/discourse/widgets/topic-status.js.es6 b/app/assets/javascripts/discourse/widgets/topic-status.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/topic-status.js.es6
rename to app/assets/javascripts/discourse/widgets/topic-status.js
diff --git a/app/assets/javascripts/discourse/widgets/topic-timeline.js.es6 b/app/assets/javascripts/discourse/widgets/topic-timeline.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/topic-timeline.js.es6
rename to app/assets/javascripts/discourse/widgets/topic-timeline.js
diff --git a/app/assets/javascripts/discourse/widgets/user-menu.js.es6 b/app/assets/javascripts/discourse/widgets/user-menu.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/user-menu.js.es6
rename to app/assets/javascripts/discourse/widgets/user-menu.js
diff --git a/app/assets/javascripts/discourse/widgets/user-notifications-large.js.es6 b/app/assets/javascripts/discourse/widgets/user-notifications-large.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/user-notifications-large.js.es6
rename to app/assets/javascripts/discourse/widgets/user-notifications-large.js
diff --git a/app/assets/javascripts/discourse/widgets/widget.js.es6 b/app/assets/javascripts/discourse/widgets/widget.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/widget.js.es6
rename to app/assets/javascripts/discourse/widgets/widget.js
diff --git a/lefthook.yml b/lefthook.yml
index 8dae834398b..7060a976d4e 100644
--- a/lefthook.yml
+++ b/lefthook.yml
@@ -8,10 +8,14 @@ pre-commit:
       glob: "*.{js,es6}"
       exclude: "vendor/*|fixtures|public/javascripts|shims.js|ember-addons|template-lintrc|locale/*|test_helper|run-qunit"
       run: yarn prettier --list-different {staged_files}
-    eslint:
-      glob: "*.{js,es6}"
+    eslint-es6:
+      glob: "*.es6"
       exclude: "vendor/*|fixtures|public/javascripts|shims.js|ember-addons|template-lintrc|locale/*|test_helper|run-qunit"
       run: yarn eslint --ext .es6 -f compact {staged_files}
+    eslint-js:
+      glob: "*.js"
+      exclude: "vendor/*|fixtures|public/javascripts|shims.js|ember-addons|template-lintrc|locale/*|test_helper|run-qunit"
+      run: yarn eslint -f compact {staged_files}
     ember-template-lint:
       run: yarn run ember-template-lint app
     yaml-syntax:
@@ -47,8 +51,10 @@ lints:
     prettier:
       glob: "{app/assets/stylesheets/**/*.scss,app/assets/javascripts/**/*.es6,test/javascripts/**/*.es6}"
       run: yarn prettier --list-different {all_files}
-    eslint-assets:
+    eslint-assets-es6:
       run: yarn eslint --ext .es6 app/assets/javascripts
+    eslint-assets-js:
+      run: yarn eslint app/assets/javascripts
     eslint-test:
       run: yarn eslint --ext .es6 test/javascripts
     eslint-plugins-assets: