diff --git a/app/assets/javascripts/discourse-loader.js b/app/assets/javascripts/discourse-loader.js
index 7682617ce94..dff3d3d50a9 100644
--- a/app/assets/javascripts/discourse-loader.js
+++ b/app/assets/javascripts/discourse-loader.js
@@ -112,16 +112,31 @@ var define, requirejs;
         isPresent: Ember.isPresent,
       },
       rsvp: {
+        asap: Ember.RSVP.asap,
+        all: Ember.RSVP.all,
+        allSettled: Ember.RSVP.allSettled,
+        race: Ember.RSVP.race,
+        hash: Ember.RSVP.hash,
+        hashSettled: Ember.RSVP.hashSettled,
+        rethrow: Ember.RSVP.rethrow,
+        defer: Ember.RSVP.defer,
+        denodeify: Ember.RSVP.denodeify,
+        resolve: Ember.RSVP.resolve,
+        reject: Ember.RSVP.reject,
+        map: Ember.RSVP.map,
+        filter: Ember.RSVP.filter,
         default: Ember.RSVP,
         Promise: Ember.RSVP.Promise,
-        hash: Ember.RSVP.hash,
-        all: Ember.RSVP.all,
+        EventTarget: Ember.RSVP.EventTarget,
       },
       "@ember/string": {
+        w: Ember.String.w,
         dasherize: Ember.String.dasherize,
+        decamelize: Ember.String.decamelize,
+        camelize: Ember.String.camelize,
         classify: Ember.String.classify,
         underscore: Ember.String.underscore,
-        camelize: Ember.String.camelize,
+        capitalize: Ember.String.capitalize,
       },
       "@ember/template": {
         htmlSafe: Ember.String.htmlSafe,
diff --git a/app/assets/javascripts/discourse/public/assets/scripts/discourse-boot.js b/app/assets/javascripts/discourse/public/assets/scripts/discourse-boot.js
index fdf76361dcf..d0120c8ea09 100644
--- a/app/assets/javascripts/discourse/public/assets/scripts/discourse-boot.js
+++ b/app/assets/javascripts/discourse/public/assets/scripts/discourse-boot.js
@@ -2,6 +2,11 @@
   // TODO: These are needed to load plugins because @ember has its own loader.
   // We should find a nicer way to do this.
   const EMBER_MODULES = {
+    "@ember/application": {
+      default: Ember.Application,
+      setOwner: Ember.setOwner,
+      getOwner: Ember.getOwner,
+    },
     "@ember/array": {
       default: Ember.Array,
       A: Ember.A,
@@ -13,6 +18,15 @@
     "@ember/component": {
       default: Ember.Component,
     },
+    "@ember/component/helper": {
+      default: Ember.Helper,
+    },
+    "@ember/component/text-field": {
+      default: Ember.TextField,
+    },
+    "@ember/component/text-area": {
+      default: Ember.TextArea,
+    },
     "@ember/controller": {
       default: Ember.Controller,
       inject: Ember.inject.controller,
@@ -20,6 +34,9 @@
     "@ember/debug": {
       warn: Ember.warn,
     },
+    "@ember/error": {
+      default: Ember.error,
+    },
     "@ember/object": {
       action: Ember._action,
       default: Ember.Object,
@@ -64,6 +81,9 @@
       uniq: Ember.computed.uniq,
       uniqBy: Ember.computed.uniqBy,
     },
+    "@ember/object/internals": {
+      guidFor: Ember.guidFor,
+    },
     "@ember/object/mixin": { default: Ember.Mixin },
     "@ember/object/proxy": { default: Ember.ObjectProxy },
     "@ember/object/promise-proxy-mixin": { default: Ember.PromiseProxyMixin },
@@ -89,6 +109,15 @@
       default: Ember.Service,
       inject: Ember.inject.service,
     },
+    "@ember/string": {
+      w: Ember.String.w,
+      dasherize: Ember.String.dasherize,
+      decamelize: Ember.String.decamelize,
+      camelize: Ember.String.camelize,
+      classify: Ember.String.classify,
+      underscore: Ember.String.underscore,
+      capitalize: Ember.String.capitalize,
+    },
     "@ember/template": {
       htmlSafe: Ember.String.htmlSafe,
     },
@@ -98,6 +127,25 @@
       isNone: Ember.isNone,
       isPresent: Ember.isPresent,
     },
+    jquery: { default: $ },
+    rsvp: {
+      asap: Ember.RSVP.asap,
+      all: Ember.RSVP.all,
+      allSettled: Ember.RSVP.allSettled,
+      race: Ember.RSVP.race,
+      hash: Ember.RSVP.hash,
+      hashSettled: Ember.RSVP.hashSettled,
+      rethrow: Ember.RSVP.rethrow,
+      defer: Ember.RSVP.defer,
+      denodeify: Ember.RSVP.denodeify,
+      resolve: Ember.RSVP.resolve,
+      reject: Ember.RSVP.reject,
+      map: Ember.RSVP.map,
+      filter: Ember.RSVP.filter,
+      default: Ember.RSVP,
+      Promise: Ember.RSVP.Promise,
+      EventTarget: Ember.RSVP.EventTarget,
+    },
   };
   Object.keys(EMBER_MODULES).forEach((mod) => {
     define(mod, () => EMBER_MODULES[mod]);