From 47e3e56905fc61a0872716fc4401e9e0956dc6ac Mon Sep 17 00:00:00 2001
From: Mark VanLandingham <mark.vanlandingham@discourse.org>
Date: Fri, 8 Nov 2019 09:48:02 -0600
Subject: [PATCH] FIX: Alias modules that are required AND imported (#8315)

---
 app/assets/javascripts/discourse-loader.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/assets/javascripts/discourse-loader.js b/app/assets/javascripts/discourse-loader.js
index fc3a0613f87..a8cd03b8003 100644
--- a/app/assets/javascripts/discourse-loader.js
+++ b/app/assets/javascripts/discourse-loader.js
@@ -151,7 +151,7 @@ var define, requirejs;
   }
 
   Module.prototype.makeRequire = function() {
-    var name = this.name;
+    var name = transformForAliases(this.name);
 
     return (
       this._require ||
@@ -217,7 +217,7 @@ var define, requirejs;
   }
 
   function requireFrom(name, origin) {
-    name = checkForAlias(name);
+    name = transformForAliases(name);
     var mod = EMBER_MODULES[name] || registry[name];
     if (!mod) {
       throw new Error(
@@ -231,7 +231,7 @@ var define, requirejs;
     throw new Error("Could not find module " + name);
   }
 
-  function checkForAlias(name) {
+  function transformForAliases(name) {
     return ALIASES[name] ? ALIASES[name] : name;
   }