From 87a6cf0133a3ad3477baf56251f95e105125bbad Mon Sep 17 00:00:00 2001
From: Jarek Radosz <jradosz@gmail.com>
Date: Wed, 17 Aug 2022 12:54:35 +0200
Subject: [PATCH] DEV: Try reducing RSVP usage

Native Promises ftw?
---
 .../javascripts/admin/addon/mixins/penalty-controller.js       | 1 -
 app/assets/javascripts/admin/addon/mixins/setting-component.js | 1 -
 app/assets/javascripts/admin/addon/models/admin-user.js        | 1 -
 app/assets/javascripts/admin/addon/services/admin-tools.js     | 1 -
 .../javascripts/discourse/app/components/bookmark-list.js      | 1 -
 app/assets/javascripts/discourse/app/components/bookmark.js    | 1 -
 app/assets/javascripts/discourse/app/components/d-editor.js    | 1 -
 app/assets/javascripts/discourse/app/components/date-input.js  | 1 -
 .../discourse/app/components/group-card-contents.js            | 1 -
 app/assets/javascripts/discourse/app/controllers/bookmark.js   | 1 -
 app/assets/javascripts/discourse/app/controllers/composer.js   | 1 -
 .../javascripts/discourse/app/controllers/create-account.js    | 1 -
 app/assets/javascripts/discourse/app/controllers/flag.js       | 1 -
 .../javascripts/discourse/app/controllers/full-page-search.js  | 1 -
 .../javascripts/discourse/app/controllers/grant-badge.js       | 3 +--
 .../discourse/app/controllers/topic-bulk-actions.js            | 1 -
 app/assets/javascripts/discourse/app/controllers/topic.js      | 1 -
 .../discourse/app/controllers/user-activity-bookmarks.js       | 1 -
 app/assets/javascripts/discourse/app/lib/ajax.js               | 1 -
 .../javascripts/discourse/app/lib/category-tag-search.js       | 1 -
 app/assets/javascripts/discourse/app/lib/click-track.js        | 1 -
 .../javascripts/discourse/app/lib/desktop-notifications.js     | 1 -
 app/assets/javascripts/discourse/app/lib/load-script.js        | 1 -
 .../javascripts/discourse/app/lib/media-optimization-utils.js  | 1 -
 app/assets/javascripts/discourse/app/lib/preload-store.js      | 1 -
 app/assets/javascripts/discourse/app/lib/pwa-utils.js          | 2 --
 app/assets/javascripts/discourse/app/lib/search.js             | 1 -
 app/assets/javascripts/discourse/app/lib/text.js               | 1 -
 app/assets/javascripts/discourse/app/lib/topic-list-tracker.js | 1 -
 .../javascripts/discourse/app/lib/uppy-checksum-plugin.js      | 1 -
 .../javascripts/discourse/app/lib/uppy-chunked-upload.js       | 1 -
 .../discourse/app/lib/uppy-chunked-uploader-plugin.js          | 1 -
 .../discourse/app/lib/uppy-media-optimization-plugin.js        | 1 -
 app/assets/javascripts/discourse/app/lib/uppy-plugin-base.js   | 1 -
 app/assets/javascripts/discourse/app/lib/user-search.js        | 1 -
 .../javascripts/discourse/app/mixins/uppy-s3-multipart.js      | 1 -
 app/assets/javascripts/discourse/app/models/badge.js           | 1 -
 app/assets/javascripts/discourse/app/models/bookmark.js        | 1 -
 app/assets/javascripts/discourse/app/models/composer.js        | 1 -
 app/assets/javascripts/discourse/app/models/group.js           | 1 -
 app/assets/javascripts/discourse/app/models/invite.js          | 1 -
 app/assets/javascripts/discourse/app/models/login-method.js    | 1 -
 app/assets/javascripts/discourse/app/models/post-stream.js     | 1 -
 app/assets/javascripts/discourse/app/models/post.js            | 1 -
 app/assets/javascripts/discourse/app/models/rest.js            | 1 -
 app/assets/javascripts/discourse/app/models/result-set.js      | 1 -
 app/assets/javascripts/discourse/app/models/reviewable.js      | 1 -
 app/assets/javascripts/discourse/app/models/static-page.js     | 1 -
 app/assets/javascripts/discourse/app/models/topic-list.js      | 1 -
 app/assets/javascripts/discourse/app/models/topic.js           | 1 -
 app/assets/javascripts/discourse/app/models/user-badge.js      | 1 -
 .../javascripts/discourse/app/models/user-drafts-stream.js     | 1 -
 .../javascripts/discourse/app/models/user-posts-stream.js      | 1 -
 app/assets/javascripts/discourse/app/models/user-stream.js     | 1 -
 app/assets/javascripts/discourse/app/models/user.js            | 1 -
 .../javascripts/discourse/app/routes/build-category-route.js   | 3 +--
 app/assets/javascripts/discourse/app/routes/new-category.js    | 1 -
 .../discourse/app/routes/user-activity-bookmarks.js            | 1 -
 app/assets/javascripts/discourse/app/routes/users.js           | 1 -
 .../discourse/app/services/media-optimization-worker.js        | 1 -
 .../discourse/app/services/pm-topic-tracking-state.js          | 2 --
 app/assets/javascripts/discourse/app/services/presence.js      | 1 -
 app/assets/javascripts/discourse/app/services/store.js         | 1 -
 app/assets/javascripts/discourse/app/widgets/post-menu.js      | 1 -
 app/assets/javascripts/discourse/app/widgets/post.js           | 1 -
 .../javascripts/discourse/app/widgets/quick-access-panel.js    | 1 -
 .../javascripts/discourse/app/widgets/quick-access-profile.js  | 1 -
 app/assets/javascripts/discourse/app/widgets/search-menu.js    | 1 -
 app/assets/javascripts/discourse/app/widgets/widget.js         | 1 -
 .../discourse/tests/acceptance/composer-actions-test.js        | 1 -
 .../javascripts/discourse/tests/acceptance/composer-test.js    | 1 -
 .../discourse/tests/acceptance/composer-uploads-uppy-test.js   | 1 -
 .../javascripts/discourse/tests/helpers/create-pretender.js    | 1 -
 .../tests/integration/components/widgets/widget-test.js        | 1 -
 .../javascripts/discourse/tests/unit/controllers/topic-test.js | 1 -
 .../javascripts/discourse/tests/unit/lib/preload-store-test.js | 1 -
 .../tests/unit/lib/uppy-media-optimization-plugin-test.js      | 1 -
 .../javascripts/discourse/tests/unit/lib/utilities-test.js     | 1 -
 .../discourse/tests/unit/models/post-stream-test.js            | 1 -
 app/assets/javascripts/pretty-text/addon/upload-short-url.js   | 1 -
 .../javascripts/select-kit/addon/components/select-kit.js      | 1 -
 app/assets/javascripts/wizard/addon/lib/preview.js             | 1 -
 .../discourse/components/discourse-local-dates-create-form.js  | 1 -
 83 files changed, 2 insertions(+), 87 deletions(-)

diff --git a/app/assets/javascripts/admin/addon/mixins/penalty-controller.js b/app/assets/javascripts/admin/addon/mixins/penalty-controller.js
index 55514dfe48..28ef7255c2 100644
--- a/app/assets/javascripts/admin/addon/mixins/penalty-controller.js
+++ b/app/assets/javascripts/admin/addon/mixins/penalty-controller.js
@@ -1,7 +1,6 @@
 import I18n from "I18n";
 import Mixin from "@ember/object/mixin";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
-import { Promise } from "rsvp";
 import bootbox from "bootbox";
 import { extractError } from "discourse/lib/ajax-error";
 import { next } from "@ember/runloop";
diff --git a/app/assets/javascripts/admin/addon/mixins/setting-component.js b/app/assets/javascripts/admin/addon/mixins/setting-component.js
index 3e2fd8f064..3f8057c3ec 100644
--- a/app/assets/javascripts/admin/addon/mixins/setting-component.js
+++ b/app/assets/javascripts/admin/addon/mixins/setting-component.js
@@ -3,7 +3,6 @@ import { fmt, propertyNotEqual } from "discourse/lib/computed";
 import { alias, oneWay } from "@ember/object/computed";
 import I18n from "I18n";
 import Mixin from "@ember/object/mixin";
-import { Promise } from "rsvp";
 import { ajax } from "discourse/lib/ajax";
 import { categoryLinkHTML } from "discourse/helpers/category-link";
 import discourseComputed, { bind } from "discourse-common/utils/decorators";
diff --git a/app/assets/javascripts/admin/addon/models/admin-user.js b/app/assets/javascripts/admin/addon/models/admin-user.js
index 3fb3e28dad..0ba8f7d605 100644
--- a/app/assets/javascripts/admin/addon/models/admin-user.js
+++ b/app/assets/javascripts/admin/addon/models/admin-user.js
@@ -1,7 +1,6 @@
 import { filter, gt, lt, not, or } from "@ember/object/computed";
 import Group from "discourse/models/group";
 import I18n from "I18n";
-import { Promise } from "rsvp";
 import User from "discourse/models/user";
 import { ajax } from "discourse/lib/ajax";
 import discourseComputed from "discourse-common/utils/decorators";
diff --git a/app/assets/javascripts/admin/addon/services/admin-tools.js b/app/assets/javascripts/admin/addon/services/admin-tools.js
index 17266be822..3441821558 100644
--- a/app/assets/javascripts/admin/addon/services/admin-tools.js
+++ b/app/assets/javascripts/admin/addon/services/admin-tools.js
@@ -1,6 +1,5 @@
 import AdminUser from "admin/models/admin-user";
 import I18n from "I18n";
-import { Promise } from "rsvp";
 import Service from "@ember/service";
 import { ajax } from "discourse/lib/ajax";
 import bootbox from "bootbox";
diff --git a/app/assets/javascripts/discourse/app/components/bookmark-list.js b/app/assets/javascripts/discourse/app/components/bookmark-list.js
index 594bf4ff11..5939034953 100644
--- a/app/assets/javascripts/discourse/app/components/bookmark-list.js
+++ b/app/assets/javascripts/discourse/app/components/bookmark-list.js
@@ -10,7 +10,6 @@ import {
 } from "discourse/lib/click-track";
 import Scrolling from "discourse/mixins/scrolling";
 import I18n from "I18n";
-import { Promise } from "rsvp";
 
 export default Component.extend(Scrolling, {
   classNames: ["bookmark-list-wrapper"],
diff --git a/app/assets/javascripts/discourse/app/components/bookmark.js b/app/assets/javascripts/discourse/app/components/bookmark.js
index b5739fa66c..fff1a764f7 100644
--- a/app/assets/javascripts/discourse/app/components/bookmark.js
+++ b/app/assets/javascripts/discourse/app/components/bookmark.js
@@ -4,7 +4,6 @@ import Component from "@ember/component";
 import I18n from "I18n";
 import KeyboardShortcuts from "discourse/lib/keyboard-shortcuts";
 import ItsATrap from "@discourse/itsatrap";
-import { Promise } from "rsvp";
 import {
   TIME_SHORTCUT_TYPES,
   defaultTimeShortcuts,
diff --git a/app/assets/javascripts/discourse/app/components/d-editor.js b/app/assets/javascripts/discourse/app/components/d-editor.js
index 7cb33c3e13..e8b5a03475 100644
--- a/app/assets/javascripts/discourse/app/components/d-editor.js
+++ b/app/assets/javascripts/discourse/app/components/d-editor.js
@@ -15,7 +15,6 @@ import { schedule, scheduleOnce } from "@ember/runloop";
 import Component from "@ember/component";
 import I18n from "I18n";
 import ItsATrap from "@discourse/itsatrap";
-import { Promise } from "rsvp";
 import { SKIP } from "discourse/lib/autocomplete";
 import { categoryHashtagTriggerRule } from "discourse/lib/category-hashtags";
 import deprecated from "discourse-common/lib/deprecated";
diff --git a/app/assets/javascripts/discourse/app/components/date-input.js b/app/assets/javascripts/discourse/app/components/date-input.js
index 16f1235112..f7adb170d1 100644
--- a/app/assets/javascripts/discourse/app/components/date-input.js
+++ b/app/assets/javascripts/discourse/app/components/date-input.js
@@ -2,7 +2,6 @@
 import discourseComputed, { on } from "discourse-common/utils/decorators";
 import Component from "@ember/component";
 import I18n from "I18n";
-import { Promise } from "rsvp";
 import { action } from "@ember/object";
 import loadScript from "discourse/lib/load-script";
 import { schedule } from "@ember/runloop";
diff --git a/app/assets/javascripts/discourse/app/components/group-card-contents.js b/app/assets/javascripts/discourse/app/components/group-card-contents.js
index cb073a6733..bfbcf3f5c4 100644
--- a/app/assets/javascripts/discourse/app/components/group-card-contents.js
+++ b/app/assets/javascripts/discourse/app/components/group-card-contents.js
@@ -2,7 +2,6 @@ import { alias, gt } from "@ember/object/computed";
 import CardContentsBase from "discourse/mixins/card-contents-base";
 import CleansUp from "discourse/mixins/cleans-up";
 import Component from "@ember/component";
-import { Promise } from "rsvp";
 import discourseComputed from "discourse-common/utils/decorators";
 import { groupPath } from "discourse/lib/url";
 import { setting } from "discourse/lib/computed";
diff --git a/app/assets/javascripts/discourse/app/controllers/bookmark.js b/app/assets/javascripts/discourse/app/controllers/bookmark.js
index c05fcda47a..a7b46d27bf 100644
--- a/app/assets/javascripts/discourse/app/controllers/bookmark.js
+++ b/app/assets/javascripts/discourse/app/controllers/bookmark.js
@@ -2,7 +2,6 @@ import Controller from "@ember/controller";
 import I18n from "I18n";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 import { action } from "@ember/object";
-import { Promise } from "rsvp";
 import showModal from "discourse/lib/show-modal";
 
 export function openBookmarkModal(
diff --git a/app/assets/javascripts/discourse/app/controllers/composer.js b/app/assets/javascripts/discourse/app/controllers/composer.js
index 75a1c5b614..d2f41d291c 100644
--- a/app/assets/javascripts/discourse/app/controllers/composer.js
+++ b/app/assets/javascripts/discourse/app/controllers/composer.js
@@ -19,7 +19,6 @@ import DiscourseURL from "discourse/lib/url";
 import Draft from "discourse/models/draft";
 import I18n from "I18n";
 import { iconHTML } from "discourse-common/lib/icon-library";
-import { Promise } from "rsvp";
 import bootbox from "bootbox";
 import { buildQuote } from "discourse/lib/quote";
 import deprecated from "discourse-common/lib/deprecated";
diff --git a/app/assets/javascripts/discourse/app/controllers/create-account.js b/app/assets/javascripts/discourse/app/controllers/create-account.js
index 370f0c210f..ab457a9c87 100644
--- a/app/assets/javascripts/discourse/app/controllers/create-account.js
+++ b/app/assets/javascripts/discourse/app/controllers/create-account.js
@@ -10,7 +10,6 @@ import I18n from "I18n";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 import NameValidation from "discourse/mixins/name-validation";
 import PasswordValidation from "discourse/mixins/password-validation";
-import { Promise } from "rsvp";
 import User from "discourse/models/user";
 import UserFieldsValidation from "discourse/mixins/user-fields-validation";
 import UsernameValidation from "discourse/mixins/username-validation";
diff --git a/app/assets/javascripts/discourse/app/controllers/flag.js b/app/assets/javascripts/discourse/app/controllers/flag.js
index 671130e482..76f6df8e3f 100644
--- a/app/assets/javascripts/discourse/app/controllers/flag.js
+++ b/app/assets/javascripts/discourse/app/controllers/flag.js
@@ -5,7 +5,6 @@ import EmberObject from "@ember/object";
 import I18n from "I18n";
 import { MAX_MESSAGE_LENGTH } from "discourse/models/post-action-type";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
-import { Promise } from "rsvp";
 import User from "discourse/models/user";
 import discourseComputed, { bind } from "discourse-common/utils/decorators";
 import { not } from "@ember/object/computed";
diff --git a/app/assets/javascripts/discourse/app/controllers/full-page-search.js b/app/assets/javascripts/discourse/app/controllers/full-page-search.js
index e082ca9d29..07e49adf50 100644
--- a/app/assets/javascripts/discourse/app/controllers/full-page-search.js
+++ b/app/assets/javascripts/discourse/app/controllers/full-page-search.js
@@ -17,7 +17,6 @@ import { isEmpty } from "@ember/utils";
 import { gt, or } from "@ember/object/computed";
 import { scrollTop } from "discourse/mixins/scroll-top";
 import { setTransient } from "discourse/lib/page-tracker";
-import { Promise } from "rsvp";
 import { search as searchCategoryTag } from "discourse/lib/category-tag-search";
 import showModal from "discourse/lib/show-modal";
 import userSearch from "discourse/lib/user-search";
diff --git a/app/assets/javascripts/discourse/app/controllers/grant-badge.js b/app/assets/javascripts/discourse/app/controllers/grant-badge.js
index 0b09e32661..565c45695c 100644
--- a/app/assets/javascripts/discourse/app/controllers/grant-badge.js
+++ b/app/assets/javascripts/discourse/app/controllers/grant-badge.js
@@ -4,7 +4,6 @@ import GrantBadgeController from "discourse/mixins/grant-badge-controller";
 import I18n from "I18n";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 import UserBadge from "discourse/models/user-badge";
-import { all } from "rsvp";
 import discourseComputed from "discourse-common/utils/decorators";
 import { extractError } from "discourse/lib/ajax-error";
 
@@ -43,7 +42,7 @@ export default Controller.extend(ModalFunctionality, GrantBadgeController, {
   onShow() {
     this.set("loading", true);
 
-    all([
+    Promise.all([
       Badge.findAll(),
       UserBadge.findByUsername(this.get("post.username")),
     ]).then(([allBadges, userBadges]) => {
diff --git a/app/assets/javascripts/discourse/app/controllers/topic-bulk-actions.js b/app/assets/javascripts/discourse/app/controllers/topic-bulk-actions.js
index dc4283c407..a7c1fda4d5 100644
--- a/app/assets/javascripts/discourse/app/controllers/topic-bulk-actions.js
+++ b/app/assets/javascripts/discourse/app/controllers/topic-bulk-actions.js
@@ -2,7 +2,6 @@ import { alias, empty } from "@ember/object/computed";
 import Controller, { inject as controller } from "@ember/controller";
 import I18n from "I18n";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
-import { Promise } from "rsvp";
 import Topic from "discourse/models/topic";
 import bootbox from "bootbox";
 
diff --git a/app/assets/javascripts/discourse/app/controllers/topic.js b/app/assets/javascripts/discourse/app/controllers/topic.js
index 30becd174d..31a7fa85e8 100644
--- a/app/assets/javascripts/discourse/app/controllers/topic.js
+++ b/app/assets/javascripts/discourse/app/controllers/topic.js
@@ -11,7 +11,6 @@ import Composer from "discourse/models/composer";
 import EmberObject, { action } from "@ember/object";
 import I18n from "I18n";
 import Post from "discourse/models/post";
-import { Promise } from "rsvp";
 import QuoteState from "discourse/lib/quote-state";
 import Topic from "discourse/models/topic";
 import TopicTimer from "discourse/models/topic-timer";
diff --git a/app/assets/javascripts/discourse/app/controllers/user-activity-bookmarks.js b/app/assets/javascripts/discourse/app/controllers/user-activity-bookmarks.js
index a4221a0087..0fcf728552 100644
--- a/app/assets/javascripts/discourse/app/controllers/user-activity-bookmarks.js
+++ b/app/assets/javascripts/discourse/app/controllers/user-activity-bookmarks.js
@@ -6,7 +6,6 @@ import discourseComputed from "discourse-common/utils/decorators";
 import { ajax } from "discourse/lib/ajax";
 import Bookmark from "discourse/models/bookmark";
 import I18n from "I18n";
-import { Promise } from "rsvp";
 import { htmlSafe } from "@ember/template";
 
 export default Controller.extend({
diff --git a/app/assets/javascripts/discourse/app/lib/ajax.js b/app/assets/javascripts/discourse/app/lib/ajax.js
index 4ec61986c9..5498eef67d 100644
--- a/app/assets/javascripts/discourse/app/lib/ajax.js
+++ b/app/assets/javascripts/discourse/app/lib/ajax.js
@@ -1,4 +1,3 @@
-import { Promise } from "rsvp";
 import Session from "discourse/models/session";
 import Site from "discourse/models/site";
 import User from "discourse/models/user";
diff --git a/app/assets/javascripts/discourse/app/lib/category-tag-search.js b/app/assets/javascripts/discourse/app/lib/category-tag-search.js
index c73b2f3cf4..a069620368 100644
--- a/app/assets/javascripts/discourse/app/lib/category-tag-search.js
+++ b/app/assets/javascripts/discourse/app/lib/category-tag-search.js
@@ -2,7 +2,6 @@ import { cancel } from "@ember/runloop";
 import discourseLater from "discourse-common/lib/later";
 import { CANCELLED_STATUS } from "discourse/lib/autocomplete";
 import Category from "discourse/models/category";
-import { Promise } from "rsvp";
 import { SEPARATOR } from "discourse/lib/category-hashtags";
 import { TAG_HASHTAG_POSTFIX } from "discourse/lib/tag-hashtags";
 import discourseDebounce from "discourse-common/lib/debounce";
diff --git a/app/assets/javascripts/discourse/app/lib/click-track.js b/app/assets/javascripts/discourse/app/lib/click-track.js
index 85754e3ef1..3f51cf408d 100644
--- a/app/assets/javascripts/discourse/app/lib/click-track.js
+++ b/app/assets/javascripts/discourse/app/lib/click-track.js
@@ -1,6 +1,5 @@
 import DiscourseURL from "discourse/lib/url";
 import I18n from "I18n";
-import { Promise } from "rsvp";
 import User from "discourse/models/user";
 import { ajax } from "discourse/lib/ajax";
 import bootbox from "bootbox";
diff --git a/app/assets/javascripts/discourse/app/lib/desktop-notifications.js b/app/assets/javascripts/discourse/app/lib/desktop-notifications.js
index 4df01460dd..7c7097c390 100644
--- a/app/assets/javascripts/discourse/app/lib/desktop-notifications.js
+++ b/app/assets/javascripts/discourse/app/lib/desktop-notifications.js
@@ -1,7 +1,6 @@
 import DiscourseURL from "discourse/lib/url";
 import I18n from "I18n";
 import KeyValueStore from "discourse/lib/key-value-store";
-import { Promise } from "rsvp";
 import Site from "discourse/models/site";
 import User from "discourse/models/user";
 import { formatUsername } from "discourse/lib/utilities";
diff --git a/app/assets/javascripts/discourse/app/lib/load-script.js b/app/assets/javascripts/discourse/app/lib/load-script.js
index 09c52809fa..d3a2225a54 100644
--- a/app/assets/javascripts/discourse/app/lib/load-script.js
+++ b/app/assets/javascripts/discourse/app/lib/load-script.js
@@ -1,6 +1,5 @@
 import getURL, { getURLWithCDN } from "discourse-common/lib/get-url";
 import { PUBLIC_JS_VERSIONS } from "discourse/lib/public-js-versions";
-import { Promise } from "rsvp";
 import { ajax } from "discourse/lib/ajax";
 import { run } from "@ember/runloop";
 import { isTesting } from "discourse-common/config/environment";
diff --git a/app/assets/javascripts/discourse/app/lib/media-optimization-utils.js b/app/assets/javascripts/discourse/app/lib/media-optimization-utils.js
index 7fd07768a6..68eb22f45b 100644
--- a/app/assets/javascripts/discourse/app/lib/media-optimization-utils.js
+++ b/app/assets/javascripts/discourse/app/lib/media-optimization-utils.js
@@ -1,4 +1,3 @@
-import { Promise } from "rsvp";
 import { helperContext } from "discourse-common/lib/helpers";
 
 // Chrome and Firefox use a native method to do Image -> Bitmap Array (it happens of the main thread!)
diff --git a/app/assets/javascripts/discourse/app/lib/preload-store.js b/app/assets/javascripts/discourse/app/lib/preload-store.js
index 3562b1da6e..0a62d145eb 100644
--- a/app/assets/javascripts/discourse/app/lib/preload-store.js
+++ b/app/assets/javascripts/discourse/app/lib/preload-store.js
@@ -1,6 +1,5 @@
 //  We can insert data into the PreloadStore when the document is loaded.
 // The data can be accessed once by a key, after which it is removed
-import { Promise } from "rsvp";
 
 export default {
   data: new Map(),
diff --git a/app/assets/javascripts/discourse/app/lib/pwa-utils.js b/app/assets/javascripts/discourse/app/lib/pwa-utils.js
index 0bcc46434a..6182c102c0 100644
--- a/app/assets/javascripts/discourse/app/lib/pwa-utils.js
+++ b/app/assets/javascripts/discourse/app/lib/pwa-utils.js
@@ -1,5 +1,3 @@
-import { Promise } from "rsvp";
-
 export function nativeShare(caps, data) {
   return new Promise((resolve, reject) => {
     if (!(caps.isIOS || caps.isAndroid || caps.isWinphone)) {
diff --git a/app/assets/javascripts/discourse/app/lib/search.js b/app/assets/javascripts/discourse/app/lib/search.js
index ac5f529a53..2c1639af36 100644
--- a/app/assets/javascripts/discourse/app/lib/search.js
+++ b/app/assets/javascripts/discourse/app/lib/search.js
@@ -1,7 +1,6 @@
 import Category from "discourse/models/category";
 import EmberObject from "@ember/object";
 import I18n from "I18n";
-import { Promise } from "rsvp";
 import Post from "discourse/models/post";
 import Topic from "discourse/models/topic";
 import User from "discourse/models/user";
diff --git a/app/assets/javascripts/discourse/app/lib/text.js b/app/assets/javascripts/discourse/app/lib/text.js
index 623e165246..231ac5ba05 100644
--- a/app/assets/javascripts/discourse/app/lib/text.js
+++ b/app/assets/javascripts/discourse/app/lib/text.js
@@ -1,7 +1,6 @@
 import PrettyText, { buildOptions } from "pretty-text/pretty-text";
 import { buildEmojiUrl, performEmojiUnescape } from "pretty-text/emoji";
 import AllowLister from "pretty-text/allow-lister";
-import { Promise } from "rsvp";
 import Session from "discourse/models/session";
 import { formatUsername } from "discourse/lib/utilities";
 import { getURLWithCDN } from "discourse-common/lib/get-url";
diff --git a/app/assets/javascripts/discourse/app/lib/topic-list-tracker.js b/app/assets/javascripts/discourse/app/lib/topic-list-tracker.js
index 8a88f6617e..768517181c 100644
--- a/app/assets/javascripts/discourse/app/lib/topic-list-tracker.js
+++ b/app/assets/javascripts/discourse/app/lib/topic-list-tracker.js
@@ -1,4 +1,3 @@
-import { Promise } from "rsvp";
 import { NotificationLevels } from "discourse/lib/notification-levels";
 
 let model, currentTopicId;
diff --git a/app/assets/javascripts/discourse/app/lib/uppy-checksum-plugin.js b/app/assets/javascripts/discourse/app/lib/uppy-checksum-plugin.js
index 27db3d1b93..79e5f11d61 100644
--- a/app/assets/javascripts/discourse/app/lib/uppy-checksum-plugin.js
+++ b/app/assets/javascripts/discourse/app/lib/uppy-checksum-plugin.js
@@ -1,5 +1,4 @@
 import { UploadPreProcessorPlugin } from "discourse/lib/uppy-plugin-base";
-import { Promise } from "rsvp";
 import { HUGE_FILE_THRESHOLD_BYTES } from "discourse/mixins/uppy-upload";
 import { bind } from "discourse-common/utils/decorators";
 
diff --git a/app/assets/javascripts/discourse/app/lib/uppy-chunked-upload.js b/app/assets/javascripts/discourse/app/lib/uppy-chunked-upload.js
index 73edc96f0e..a4da757a92 100644
--- a/app/assets/javascripts/discourse/app/lib/uppy-chunked-upload.js
+++ b/app/assets/javascripts/discourse/app/lib/uppy-chunked-upload.js
@@ -1,4 +1,3 @@
-import { Promise } from "rsvp";
 import delay from "@uppy/utils/lib/delay";
 import {
   AbortController,
diff --git a/app/assets/javascripts/discourse/app/lib/uppy-chunked-uploader-plugin.js b/app/assets/javascripts/discourse/app/lib/uppy-chunked-uploader-plugin.js
index 44ec635856..70181abd49 100644
--- a/app/assets/javascripts/discourse/app/lib/uppy-chunked-uploader-plugin.js
+++ b/app/assets/javascripts/discourse/app/lib/uppy-chunked-uploader-plugin.js
@@ -1,7 +1,6 @@
 import { UploaderPlugin } from "discourse/lib/uppy-plugin-base";
 import { next } from "@ember/runloop";
 import getURL from "discourse-common/lib/get-url";
-import { Promise } from "rsvp";
 import UppyChunkedUpload from "discourse/lib/uppy-chunked-upload";
 import EventTracker from "@uppy/utils/lib/EventTracker";
 
diff --git a/app/assets/javascripts/discourse/app/lib/uppy-media-optimization-plugin.js b/app/assets/javascripts/discourse/app/lib/uppy-media-optimization-plugin.js
index 26b465cbb1..4f368cb7f3 100644
--- a/app/assets/javascripts/discourse/app/lib/uppy-media-optimization-plugin.js
+++ b/app/assets/javascripts/discourse/app/lib/uppy-media-optimization-plugin.js
@@ -1,5 +1,4 @@
 import { UploadPreProcessorPlugin } from "discourse/lib/uppy-plugin-base";
-import { Promise } from "rsvp";
 import { bind } from "discourse-common/utils/decorators";
 
 export default class UppyMediaOptimization extends UploadPreProcessorPlugin {
diff --git a/app/assets/javascripts/discourse/app/lib/uppy-plugin-base.js b/app/assets/javascripts/discourse/app/lib/uppy-plugin-base.js
index 421229e999..9036ebf4d4 100644
--- a/app/assets/javascripts/discourse/app/lib/uppy-plugin-base.js
+++ b/app/assets/javascripts/discourse/app/lib/uppy-plugin-base.js
@@ -1,5 +1,4 @@
 import { BasePlugin } from "@uppy/core";
-import { Promise } from "rsvp";
 import { warn } from "@ember/debug";
 import { isTesting } from "discourse-common/config/environment";
 
diff --git a/app/assets/javascripts/discourse/app/lib/user-search.js b/app/assets/javascripts/discourse/app/lib/user-search.js
index e24770fead..7a3590cf1f 100644
--- a/app/assets/javascripts/discourse/app/lib/user-search.js
+++ b/app/assets/javascripts/discourse/app/lib/user-search.js
@@ -1,7 +1,6 @@
 import { cancel } from "@ember/runloop";
 import discourseLater from "discourse-common/lib/later";
 import { CANCELLED_STATUS } from "discourse/lib/autocomplete";
-import { Promise } from "rsvp";
 import discourseDebounce from "discourse-common/lib/debounce";
 import { emailValid } from "discourse/lib/utilities";
 import { isTesting } from "discourse-common/config/environment";
diff --git a/app/assets/javascripts/discourse/app/mixins/uppy-s3-multipart.js b/app/assets/javascripts/discourse/app/mixins/uppy-s3-multipart.js
index e2d75eb06c..7113ac11df 100644
--- a/app/assets/javascripts/discourse/app/mixins/uppy-s3-multipart.js
+++ b/app/assets/javascripts/discourse/app/mixins/uppy-s3-multipart.js
@@ -1,7 +1,6 @@
 import Mixin from "@ember/object/mixin";
 import getUrl from "discourse-common/lib/get-url";
 import { bind } from "discourse-common/utils/decorators";
-import { Promise } from "rsvp";
 import { ajax } from "discourse/lib/ajax";
 import AwsS3Multipart from "@uppy/aws-s3-multipart";
 const RETRY_DELAYS = [0, 1000, 3000, 5000];
diff --git a/app/assets/javascripts/discourse/app/models/badge.js b/app/assets/javascripts/discourse/app/models/badge.js
index 9c249f89c5..cbaa34057d 100644
--- a/app/assets/javascripts/discourse/app/models/badge.js
+++ b/app/assets/javascripts/discourse/app/models/badge.js
@@ -1,6 +1,5 @@
 import BadgeGrouping from "discourse/models/badge-grouping";
 import EmberObject from "@ember/object";
-import { Promise } from "rsvp";
 import RestModel from "discourse/models/rest";
 import { ajax } from "discourse/lib/ajax";
 import discourseComputed from "discourse-common/utils/decorators";
diff --git a/app/assets/javascripts/discourse/app/models/bookmark.js b/app/assets/javascripts/discourse/app/models/bookmark.js
index cd8c81dfc9..ba16854b9b 100644
--- a/app/assets/javascripts/discourse/app/models/bookmark.js
+++ b/app/assets/javascripts/discourse/app/models/bookmark.js
@@ -1,6 +1,5 @@
 import categoryFromId from "discourse-common/utils/category-macro";
 import I18n from "I18n";
-import { Promise } from "rsvp";
 import RestModel from "discourse/models/rest";
 import User from "discourse/models/user";
 import Topic from "discourse/models/topic";
diff --git a/app/assets/javascripts/discourse/app/models/composer.js b/app/assets/javascripts/discourse/app/models/composer.js
index 9b4854a638..d36def68fc 100644
--- a/app/assets/javascripts/discourse/app/models/composer.js
+++ b/app/assets/javascripts/discourse/app/models/composer.js
@@ -12,7 +12,6 @@ import {
 } from "discourse/lib/utilities";
 import Draft from "discourse/models/draft";
 import I18n from "I18n";
-import { Promise } from "rsvp";
 import { QUOTE_REGEXP } from "discourse/lib/quote";
 import RestModel from "discourse/models/rest";
 import Site from "discourse/models/site";
diff --git a/app/assets/javascripts/discourse/app/models/group.js b/app/assets/javascripts/discourse/app/models/group.js
index fc1b4725fb..b4766e81ea 100644
--- a/app/assets/javascripts/discourse/app/models/group.js
+++ b/app/assets/javascripts/discourse/app/models/group.js
@@ -2,7 +2,6 @@ import discourseComputed, { observes } from "discourse-common/utils/decorators";
 import Category from "discourse/models/category";
 import EmberObject from "@ember/object";
 import GroupHistory from "discourse/models/group-history";
-import { Promise } from "rsvp";
 import RestModel from "discourse/models/rest";
 import Topic from "discourse/models/topic";
 import User from "discourse/models/user";
diff --git a/app/assets/javascripts/discourse/app/models/invite.js b/app/assets/javascripts/discourse/app/models/invite.js
index 6608ecb079..bcfccbd752 100644
--- a/app/assets/javascripts/discourse/app/models/invite.js
+++ b/app/assets/javascripts/discourse/app/models/invite.js
@@ -1,6 +1,5 @@
 import EmberObject from "@ember/object";
 import { alias } from "@ember/object/computed";
-import { Promise } from "rsvp";
 import discourseComputed from "discourse-common/utils/decorators";
 import Topic from "discourse/models/topic";
 import User from "discourse/models/user";
diff --git a/app/assets/javascripts/discourse/app/models/login-method.js b/app/assets/javascripts/discourse/app/models/login-method.js
index 0c3b516873..68b598aade 100644
--- a/app/assets/javascripts/discourse/app/models/login-method.js
+++ b/app/assets/javascripts/discourse/app/models/login-method.js
@@ -1,6 +1,5 @@
 import EmberObject from "@ember/object";
 import I18n from "I18n";
-import { Promise } from "rsvp";
 import Session from "discourse/models/session";
 import Site from "discourse/models/site";
 import discourseComputed from "discourse-common/utils/decorators";
diff --git a/app/assets/javascripts/discourse/app/models/post-stream.js b/app/assets/javascripts/discourse/app/models/post-stream.js
index 040f77faa1..792a4c6f37 100644
--- a/app/assets/javascripts/discourse/app/models/post-stream.js
+++ b/app/assets/javascripts/discourse/app/models/post-stream.js
@@ -2,7 +2,6 @@ import { and, equal, not, or } from "@ember/object/computed";
 import DiscourseURL from "discourse/lib/url";
 import I18n from "I18n";
 import PostsWithPlaceholders from "discourse/lib/posts-with-placeholders";
-import { Promise } from "rsvp";
 import RestModel from "discourse/models/rest";
 import User from "discourse/models/user";
 import { ajax } from "discourse/lib/ajax";
diff --git a/app/assets/javascripts/discourse/app/models/post.js b/app/assets/javascripts/discourse/app/models/post.js
index 25a8f40168..d70b8f5345 100644
--- a/app/assets/javascripts/discourse/app/models/post.js
+++ b/app/assets/javascripts/discourse/app/models/post.js
@@ -3,7 +3,6 @@ import { and, equal, not, or } from "@ember/object/computed";
 import ActionSummary from "discourse/models/action-summary";
 import Composer from "discourse/models/composer";
 import I18n from "I18n";
-import { Promise } from "rsvp";
 import RestModel from "discourse/models/rest";
 import Site from "discourse/models/site";
 import User from "discourse/models/user";
diff --git a/app/assets/javascripts/discourse/app/models/rest.js b/app/assets/javascripts/discourse/app/models/rest.js
index 8e9cd09f9b..27fbb3a2c5 100644
--- a/app/assets/javascripts/discourse/app/models/rest.js
+++ b/app/assets/javascripts/discourse/app/models/rest.js
@@ -1,5 +1,4 @@
 import EmberObject from "@ember/object";
-import { Promise } from "rsvp";
 import { equal } from "@ember/object/computed";
 import { getOwner } from "discourse-common/lib/get-owner";
 import { warn } from "@ember/debug";
diff --git a/app/assets/javascripts/discourse/app/models/result-set.js b/app/assets/javascripts/discourse/app/models/result-set.js
index 644e75638b..e8af3cf433 100644
--- a/app/assets/javascripts/discourse/app/models/result-set.js
+++ b/app/assets/javascripts/discourse/app/models/result-set.js
@@ -1,5 +1,4 @@
 import ArrayProxy from "@ember/array/proxy";
-import { Promise } from "rsvp";
 import discourseComputed from "discourse-common/utils/decorators";
 
 export default ArrayProxy.extend({
diff --git a/app/assets/javascripts/discourse/app/models/reviewable.js b/app/assets/javascripts/discourse/app/models/reviewable.js
index a8e0a8ad8d..833ad30a89 100644
--- a/app/assets/javascripts/discourse/app/models/reviewable.js
+++ b/app/assets/javascripts/discourse/app/models/reviewable.js
@@ -1,6 +1,5 @@
 import categoryFromId from "discourse-common/utils/category-macro";
 import I18n from "I18n";
-import { Promise } from "rsvp";
 import RestModel from "discourse/models/rest";
 import { ajax } from "discourse/lib/ajax";
 import discourseComputed from "discourse-common/utils/decorators";
diff --git a/app/assets/javascripts/discourse/app/models/static-page.js b/app/assets/javascripts/discourse/app/models/static-page.js
index 38e373dffa..621b5b0ef0 100644
--- a/app/assets/javascripts/discourse/app/models/static-page.js
+++ b/app/assets/javascripts/discourse/app/models/static-page.js
@@ -1,5 +1,4 @@
 import EmberObject from "@ember/object";
-import { Promise } from "rsvp";
 import { ajax } from "discourse/lib/ajax";
 
 const StaticPage = EmberObject.extend();
diff --git a/app/assets/javascripts/discourse/app/models/topic-list.js b/app/assets/javascripts/discourse/app/models/topic-list.js
index c108f8b41e..795d19ebf3 100644
--- a/app/assets/javascripts/discourse/app/models/topic-list.js
+++ b/app/assets/javascripts/discourse/app/models/topic-list.js
@@ -1,5 +1,4 @@
 import EmberObject from "@ember/object";
-import { Promise } from "rsvp";
 import RestModel from "discourse/models/rest";
 import Session from "discourse/models/session";
 import User from "discourse/models/user";
diff --git a/app/assets/javascripts/discourse/app/models/topic.js b/app/assets/javascripts/discourse/app/models/topic.js
index 53b4af4e20..1b7cbb5caa 100644
--- a/app/assets/javascripts/discourse/app/models/topic.js
+++ b/app/assets/javascripts/discourse/app/models/topic.js
@@ -6,7 +6,6 @@ import Bookmark from "discourse/models/bookmark";
 import EmberObject from "@ember/object";
 import I18n from "I18n";
 import PreloadStore from "discourse/lib/preload-store";
-import { Promise } from "rsvp";
 import RestModel from "discourse/models/rest";
 import Site from "discourse/models/site";
 import User from "discourse/models/user";
diff --git a/app/assets/javascripts/discourse/app/models/user-badge.js b/app/assets/javascripts/discourse/app/models/user-badge.js
index 0956323b4f..62126c1bff 100644
--- a/app/assets/javascripts/discourse/app/models/user-badge.js
+++ b/app/assets/javascripts/discourse/app/models/user-badge.js
@@ -1,6 +1,5 @@
 import Badge from "discourse/models/badge";
 import EmberObject from "@ember/object";
-import { Promise } from "rsvp";
 import Topic from "discourse/models/topic";
 import User from "discourse/models/user";
 import { ajax } from "discourse/lib/ajax";
diff --git a/app/assets/javascripts/discourse/app/models/user-drafts-stream.js b/app/assets/javascripts/discourse/app/models/user-drafts-stream.js
index d58437c8dc..6e57ed62f6 100644
--- a/app/assets/javascripts/discourse/app/models/user-drafts-stream.js
+++ b/app/assets/javascripts/discourse/app/models/user-drafts-stream.js
@@ -8,7 +8,6 @@ import {
 } from "discourse/models/composer";
 import RestModel from "discourse/models/rest";
 import UserDraft from "discourse/models/user-draft";
-import { Promise } from "rsvp";
 
 export default RestModel.extend({
   limit: 30,
diff --git a/app/assets/javascripts/discourse/app/models/user-posts-stream.js b/app/assets/javascripts/discourse/app/models/user-posts-stream.js
index 53f48c9f24..59484e503d 100644
--- a/app/assets/javascripts/discourse/app/models/user-posts-stream.js
+++ b/app/assets/javascripts/discourse/app/models/user-posts-stream.js
@@ -1,5 +1,4 @@
 import EmberObject from "@ember/object";
-import { Promise } from "rsvp";
 import UserAction from "discourse/models/user-action";
 import { ajax } from "discourse/lib/ajax";
 import { on } from "discourse-common/utils/decorators";
diff --git a/app/assets/javascripts/discourse/app/models/user-stream.js b/app/assets/javascripts/discourse/app/models/user-stream.js
index 014e78754b..d92a073996 100644
--- a/app/assets/javascripts/discourse/app/models/user-stream.js
+++ b/app/assets/javascripts/discourse/app/models/user-stream.js
@@ -1,6 +1,5 @@
 import discourseComputed, { on } from "discourse-common/utils/decorators";
 import { A } from "@ember/array";
-import { Promise } from "rsvp";
 import RestModel from "discourse/models/rest";
 import UserAction from "discourse/models/user-action";
 import { ajax } from "discourse/lib/ajax";
diff --git a/app/assets/javascripts/discourse/app/models/user.js b/app/assets/javascripts/discourse/app/models/user.js
index 64b1077a98..21540518bf 100644
--- a/app/assets/javascripts/discourse/app/models/user.js
+++ b/app/assets/javascripts/discourse/app/models/user.js
@@ -11,7 +11,6 @@ import Group from "discourse/models/group";
 import I18n from "I18n";
 import { NotificationLevels } from "discourse/lib/notification-levels";
 import PreloadStore from "discourse/lib/preload-store";
-import { Promise } from "rsvp";
 import RestModel from "discourse/models/rest";
 import Singleton from "discourse/mixins/singleton";
 import Site from "discourse/models/site";
diff --git a/app/assets/javascripts/discourse/app/routes/build-category-route.js b/app/assets/javascripts/discourse/app/routes/build-category-route.js
index 74e17b9b3e..3d4e3663b1 100644
--- a/app/assets/javascripts/discourse/app/routes/build-category-route.js
+++ b/app/assets/javascripts/discourse/app/routes/build-category-route.js
@@ -1,4 +1,3 @@
-import { Promise, all } from "rsvp";
 import {
   changeSort,
   queryParams,
@@ -66,7 +65,7 @@ export default (filterArg, params) => {
       }
 
       this._setupNavigation(category);
-      return all([
+      return Promise.all([
         this._createSubcategoryList(category),
         this._retrieveTopicList(category, transition, modelParams),
       ]);
diff --git a/app/assets/javascripts/discourse/app/routes/new-category.js b/app/assets/javascripts/discourse/app/routes/new-category.js
index d988839158..3aefc48989 100644
--- a/app/assets/javascripts/discourse/app/routes/new-category.js
+++ b/app/assets/javascripts/discourse/app/routes/new-category.js
@@ -1,6 +1,5 @@
 import DiscourseRoute from "discourse/routes/discourse";
 import I18n from "I18n";
-import { Promise } from "rsvp";
 import { SEARCH_PRIORITIES } from "discourse/lib/constants";
 
 let _newCategoryColor = "0088CC",
diff --git a/app/assets/javascripts/discourse/app/routes/user-activity-bookmarks.js b/app/assets/javascripts/discourse/app/routes/user-activity-bookmarks.js
index a29d1124f4..281acf6926 100644
--- a/app/assets/javascripts/discourse/app/routes/user-activity-bookmarks.js
+++ b/app/assets/javascripts/discourse/app/routes/user-activity-bookmarks.js
@@ -1,7 +1,6 @@
 import { action } from "@ember/object";
 import { ajax } from "discourse/lib/ajax";
 import DiscourseRoute from "discourse/routes/discourse";
-import { Promise } from "rsvp";
 
 export default DiscourseRoute.extend({
   queryParams: {
diff --git a/app/assets/javascripts/discourse/app/routes/users.js b/app/assets/javascripts/discourse/app/routes/users.js
index 442f2b3b55..c8a25febe5 100644
--- a/app/assets/javascripts/discourse/app/routes/users.js
+++ b/app/assets/javascripts/discourse/app/routes/users.js
@@ -2,7 +2,6 @@ import DiscourseRoute from "discourse/routes/discourse";
 import I18n from "I18n";
 import { ajax } from "discourse/lib/ajax";
 import { popupAjaxError } from "discourse/lib/ajax-error";
-import { Promise } from "rsvp";
 import { action } from "@ember/object";
 
 export default DiscourseRoute.extend({
diff --git a/app/assets/javascripts/discourse/app/services/media-optimization-worker.js b/app/assets/javascripts/discourse/app/services/media-optimization-worker.js
index 12873d7c87..0fbbb371cd 100644
--- a/app/assets/javascripts/discourse/app/services/media-optimization-worker.js
+++ b/app/assets/javascripts/discourse/app/services/media-optimization-worker.js
@@ -1,6 +1,5 @@
 import Service from "@ember/service";
 import { getOwner } from "@ember/application";
-import { Promise } from "rsvp";
 import { fileToImageData } from "discourse/lib/media-optimization-utils";
 import { getAbsoluteURL, getURLWithCDN } from "discourse-common/lib/get-url";
 
diff --git a/app/assets/javascripts/discourse/app/services/pm-topic-tracking-state.js b/app/assets/javascripts/discourse/app/services/pm-topic-tracking-state.js
index 66165b6a29..87dedd1dd0 100644
--- a/app/assets/javascripts/discourse/app/services/pm-topic-tracking-state.js
+++ b/app/assets/javascripts/discourse/app/services/pm-topic-tracking-state.js
@@ -1,5 +1,3 @@
-import { Promise } from "rsvp";
-
 import Service from "@ember/service";
 import { ajax } from "discourse/lib/ajax";
 import { bind, on } from "discourse-common/utils/decorators";
diff --git a/app/assets/javascripts/discourse/app/services/presence.js b/app/assets/javascripts/discourse/app/services/presence.js
index d3742eb017..32f44c9482 100644
--- a/app/assets/javascripts/discourse/app/services/presence.js
+++ b/app/assets/javascripts/discourse/app/services/presence.js
@@ -4,7 +4,6 @@ import { ajax } from "discourse/lib/ajax";
 import { cancel, debounce, next, once, throttle } from "@ember/runloop";
 import discourseLater from "discourse-common/lib/later";
 import Session from "discourse/models/session";
-import { Promise } from "rsvp";
 import User from "discourse/models/user";
 import userPresent, {
   onPresenceChange,
diff --git a/app/assets/javascripts/discourse/app/services/store.js b/app/assets/javascripts/discourse/app/services/store.js
index 57489ab0be..a4b6b90ead 100644
--- a/app/assets/javascripts/discourse/app/services/store.js
+++ b/app/assets/javascripts/discourse/app/services/store.js
@@ -1,6 +1,5 @@
 import Service from "@ember/service";
 import { set } from "@ember/object";
-import { Promise } from "rsvp";
 import RestModel from "discourse/models/rest";
 import ResultSet from "discourse/models/result-set";
 import { ajax } from "discourse/lib/ajax";
diff --git a/app/assets/javascripts/discourse/app/widgets/post-menu.js b/app/assets/javascripts/discourse/app/widgets/post-menu.js
index 7389b2b24c..42c17da323 100644
--- a/app/assets/javascripts/discourse/app/widgets/post-menu.js
+++ b/app/assets/javascripts/discourse/app/widgets/post-menu.js
@@ -1,7 +1,6 @@
 import { applyDecorators, createWidget } from "discourse/widgets/widget";
 import { next } from "@ember/runloop";
 import discourseLater from "discourse-common/lib/later";
-import { Promise } from "rsvp";
 import { formattedReminderTime } from "discourse/lib/bookmark";
 import { h } from "virtual-dom";
 import showModal from "discourse/lib/show-modal";
diff --git a/app/assets/javascripts/discourse/app/widgets/post.js b/app/assets/javascripts/discourse/app/widgets/post.js
index e4354c844a..db8946693f 100644
--- a/app/assets/javascripts/discourse/app/widgets/post.js
+++ b/app/assets/javascripts/discourse/app/widgets/post.js
@@ -9,7 +9,6 @@ import DecoratorHelper from "discourse/widgets/decorator-helper";
 import DiscourseURL from "discourse/lib/url";
 import I18n from "I18n";
 import PostCooked from "discourse/widgets/post-cooked";
-import { Promise } from "rsvp";
 import RawHtml from "discourse/widgets/raw-html";
 import bootbox from "bootbox";
 import { dateNode } from "discourse/helpers/node";
diff --git a/app/assets/javascripts/discourse/app/widgets/quick-access-panel.js b/app/assets/javascripts/discourse/app/widgets/quick-access-panel.js
index 6c8036f5e5..ce29f6c2f6 100644
--- a/app/assets/javascripts/discourse/app/widgets/quick-access-panel.js
+++ b/app/assets/javascripts/discourse/app/widgets/quick-access-panel.js
@@ -1,5 +1,4 @@
 import I18n from "I18n";
-import { Promise } from "rsvp";
 import Session from "discourse/models/session";
 import { createWidget } from "discourse/widgets/widget";
 import { h } from "virtual-dom";
diff --git a/app/assets/javascripts/discourse/app/widgets/quick-access-profile.js b/app/assets/javascripts/discourse/app/widgets/quick-access-profile.js
index b30dbdf224..ea3a22f0d9 100644
--- a/app/assets/javascripts/discourse/app/widgets/quick-access-profile.js
+++ b/app/assets/javascripts/discourse/app/widgets/quick-access-profile.js
@@ -1,5 +1,4 @@
 import I18n from "I18n";
-import { Promise } from "rsvp";
 import QuickAccessItem from "discourse/widgets/quick-access-item";
 import QuickAccessPanel from "discourse/widgets/quick-access-panel";
 import { createWidgetFrom } from "discourse/widgets/widget";
diff --git a/app/assets/javascripts/discourse/app/widgets/search-menu.js b/app/assets/javascripts/discourse/app/widgets/search-menu.js
index 09caead6b7..dbcd4e73d1 100644
--- a/app/assets/javascripts/discourse/app/widgets/search-menu.js
+++ b/app/assets/javascripts/discourse/app/widgets/search-menu.js
@@ -11,7 +11,6 @@ import { h } from "virtual-dom";
 import { iconNode } from "discourse-common/lib/icon-library";
 import { isiPad, translateModKey } from "discourse/lib/utilities";
 import { popupAjaxError } from "discourse/lib/ajax-error";
-import { Promise } from "rsvp";
 import { search as searchCategoryTag } from "discourse/lib/category-tag-search";
 import userSearch from "discourse/lib/user-search";
 import { CANCELLED_STATUS } from "discourse/lib/autocomplete";
diff --git a/app/assets/javascripts/discourse/app/widgets/widget.js b/app/assets/javascripts/discourse/app/widgets/widget.js
index 0985f0283f..fbad8c691c 100644
--- a/app/assets/javascripts/discourse/app/widgets/widget.js
+++ b/app/assets/javascripts/discourse/app/widgets/widget.js
@@ -18,7 +18,6 @@ import {
 } from "discourse/widgets/hooks";
 import DecoratorHelper from "discourse/widgets/decorator-helper";
 import I18n from "I18n";
-import { Promise } from "rsvp";
 import { deepMerge } from "discourse-common/lib/object";
 import { get } from "@ember/object";
 import { h } from "virtual-dom";
diff --git a/app/assets/javascripts/discourse/tests/acceptance/composer-actions-test.js b/app/assets/javascripts/discourse/tests/acceptance/composer-actions-test.js
index d22ba940de..82af477c95 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/composer-actions-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/composer-actions-test.js
@@ -9,7 +9,6 @@ import {
 import { click, fillIn, visit } from "@ember/test-helpers";
 import Draft from "discourse/models/draft";
 import I18n from "I18n";
-import { Promise } from "rsvp";
 import selectKit from "discourse/tests/helpers/select-kit-helper";
 import sinon from "sinon";
 import { test } from "qunit";
diff --git a/app/assets/javascripts/discourse/tests/acceptance/composer-test.js b/app/assets/javascripts/discourse/tests/acceptance/composer-test.js
index c5b539b4db..3a4e0aa1f1 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/composer-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/composer-test.js
@@ -21,7 +21,6 @@ import {
 import selectKit from "discourse/tests/helpers/select-kit-helper";
 import I18n from "I18n";
 import { test } from "qunit";
-import { Promise } from "rsvp";
 import sinon from "sinon";
 
 acceptance("Composer", function (needs) {
diff --git a/app/assets/javascripts/discourse/tests/acceptance/composer-uploads-uppy-test.js b/app/assets/javascripts/discourse/tests/acceptance/composer-uploads-uppy-test.js
index c966f796d4..e1da4cbd27 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/composer-uploads-uppy-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/composer-uploads-uppy-test.js
@@ -11,7 +11,6 @@ import { authorizedExtensions } from "discourse/lib/uploads";
 import { click, fillIn, settled, visit } from "@ember/test-helpers";
 import I18n from "I18n";
 import { skip, test } from "qunit";
-import { Promise } from "rsvp";
 import sinon from "sinon";
 
 function pretender(server, helper) {
diff --git a/app/assets/javascripts/discourse/tests/helpers/create-pretender.js b/app/assets/javascripts/discourse/tests/helpers/create-pretender.js
index 40317640ee..af7520569d 100644
--- a/app/assets/javascripts/discourse/tests/helpers/create-pretender.js
+++ b/app/assets/javascripts/discourse/tests/helpers/create-pretender.js
@@ -1,7 +1,6 @@
 import Pretender from "pretender";
 import User from "discourse/models/user";
 import getURL from "discourse-common/lib/get-url";
-import { Promise } from "rsvp";
 
 export function parsePostData(query) {
   const result = {};
diff --git a/app/assets/javascripts/discourse/tests/integration/components/widgets/widget-test.js b/app/assets/javascripts/discourse/tests/integration/components/widgets/widget-test.js
index f540666270..b196d5108d 100644
--- a/app/assets/javascripts/discourse/tests/integration/components/widgets/widget-test.js
+++ b/app/assets/javascripts/discourse/tests/integration/components/widgets/widget-test.js
@@ -5,7 +5,6 @@ import { count, exists, query } from "discourse/tests/helpers/qunit-helpers";
 import { hbs } from "ember-cli-htmlbars";
 import widgetHbs from "discourse/widgets/hbs-compiler";
 import I18n from "I18n";
-import { Promise } from "rsvp";
 import { createWidget } from "discourse/widgets/widget";
 import { next } from "@ember/runloop";
 import { withPluginApi } from "discourse/lib/plugin-api";
diff --git a/app/assets/javascripts/discourse/tests/unit/controllers/topic-test.js b/app/assets/javascripts/discourse/tests/unit/controllers/topic-test.js
index ebdd1d1289..4ae9e9e36d 100644
--- a/app/assets/javascripts/discourse/tests/unit/controllers/topic-test.js
+++ b/app/assets/javascripts/discourse/tests/unit/controllers/topic-test.js
@@ -1,6 +1,5 @@
 import EmberObject from "@ember/object";
 import { Placeholder } from "discourse/lib/posts-with-placeholders";
-import { Promise } from "rsvp";
 import Topic from "discourse/models/topic";
 import User from "discourse/models/user";
 import { discourseModule } from "discourse/tests/helpers/qunit-helpers";
diff --git a/app/assets/javascripts/discourse/tests/unit/lib/preload-store-test.js b/app/assets/javascripts/discourse/tests/unit/lib/preload-store-test.js
index ca060af841..5c834200c9 100644
--- a/app/assets/javascripts/discourse/tests/unit/lib/preload-store-test.js
+++ b/app/assets/javascripts/discourse/tests/unit/lib/preload-store-test.js
@@ -1,6 +1,5 @@
 import { module, test } from "qunit";
 import PreloadStore from "discourse/lib/preload-store";
-import { Promise } from "rsvp";
 
 module("Unit | Utility | preload-store", function (hooks) {
   hooks.beforeEach(function () {
diff --git a/app/assets/javascripts/discourse/tests/unit/lib/uppy-media-optimization-plugin-test.js b/app/assets/javascripts/discourse/tests/unit/lib/uppy-media-optimization-plugin-test.js
index 7b2978e2da..bbb2eca33c 100644
--- a/app/assets/javascripts/discourse/tests/unit/lib/uppy-media-optimization-plugin-test.js
+++ b/app/assets/javascripts/discourse/tests/unit/lib/uppy-media-optimization-plugin-test.js
@@ -1,6 +1,5 @@
 import UppyMediaOptimization from "discourse/lib/uppy-media-optimization-plugin";
 import { module, test } from "qunit";
-import { Promise } from "rsvp";
 
 class FakeUppy {
   constructor() {
diff --git a/app/assets/javascripts/discourse/tests/unit/lib/utilities-test.js b/app/assets/javascripts/discourse/tests/unit/lib/utilities-test.js
index ebc2f66d70..aa3d2170e4 100644
--- a/app/assets/javascripts/discourse/tests/unit/lib/utilities-test.js
+++ b/app/assets/javascripts/discourse/tests/unit/lib/utilities-test.js
@@ -1,4 +1,3 @@
-import { Promise } from "rsvp";
 import {
   avatarImg,
   avatarUrl,
diff --git a/app/assets/javascripts/discourse/tests/unit/models/post-stream-test.js b/app/assets/javascripts/discourse/tests/unit/models/post-stream-test.js
index ea255ffbbd..c8787560d3 100644
--- a/app/assets/javascripts/discourse/tests/unit/models/post-stream-test.js
+++ b/app/assets/javascripts/discourse/tests/unit/models/post-stream-test.js
@@ -2,7 +2,6 @@ import { module, test } from "qunit";
 import AppEvents from "discourse/services/app-events";
 import ArrayProxy from "@ember/array/proxy";
 import Post from "discourse/models/post";
-import { Promise } from "rsvp";
 import User from "discourse/models/user";
 import createStore from "discourse/tests/helpers/create-store";
 import pretender, { response } from "discourse/tests/helpers/create-pretender";
diff --git a/app/assets/javascripts/pretty-text/addon/upload-short-url.js b/app/assets/javascripts/pretty-text/addon/upload-short-url.js
index 4eab94ca82..2bce72d521 100644
--- a/app/assets/javascripts/pretty-text/addon/upload-short-url.js
+++ b/app/assets/javascripts/pretty-text/addon/upload-short-url.js
@@ -1,6 +1,5 @@
 import discourseDebounce from "discourse-common/lib/debounce";
 import I18n from "I18n";
-import { Promise } from "rsvp";
 
 let _cache = {};
 
diff --git a/app/assets/javascripts/select-kit/addon/components/select-kit.js b/app/assets/javascripts/select-kit/addon/components/select-kit.js
index 7cdc738b0d..8a3a64fe9d 100644
--- a/app/assets/javascripts/select-kit/addon/components/select-kit.js
+++ b/app/assets/javascripts/select-kit/addon/components/select-kit.js
@@ -9,7 +9,6 @@ import { isEmpty, isNone, isPresent } from "@ember/utils";
 import Component from "@ember/component";
 import I18n from "I18n";
 import Mixin from "@ember/object/mixin";
-import { Promise } from "rsvp";
 import UtilsMixin from "select-kit/mixins/utils";
 import { createPopper } from "@popperjs/core";
 import deprecated from "discourse-common/lib/deprecated";
diff --git a/app/assets/javascripts/wizard/addon/lib/preview.js b/app/assets/javascripts/wizard/addon/lib/preview.js
index 27c16f9e75..f230343cfe 100644
--- a/app/assets/javascripts/wizard/addon/lib/preview.js
+++ b/app/assets/javascripts/wizard/addon/lib/preview.js
@@ -1,5 +1,4 @@
 import Component from "@ember/component";
-import { Promise } from "rsvp";
 /*eslint no-bitwise:0 */
 import getUrl from "discourse-common/lib/get-url";
 import { htmlSafe } from "@ember/template";
diff --git a/plugins/discourse-local-dates/assets/javascripts/discourse/components/discourse-local-dates-create-form.js b/plugins/discourse-local-dates/assets/javascripts/discourse/components/discourse-local-dates-create-form.js
index 400489e895..c585bd0b8f 100644
--- a/plugins/discourse-local-dates/assets/javascripts/discourse/components/discourse-local-dates-create-form.js
+++ b/plugins/discourse-local-dates/assets/javascripts/discourse/components/discourse-local-dates-create-form.js
@@ -4,7 +4,6 @@ import Component from "@ember/component";
 import EmberObject from "@ember/object";
 import I18n from "I18n";
 import { INPUT_DELAY } from "discourse-common/config/environment";
-import { Promise } from "rsvp";
 import { cookAsync } from "discourse/lib/text";
 import discourseDebounce from "discourse-common/lib/debounce";
 import { isEmpty } from "@ember/utils";