From e8e67c7449f61f0d4f41941d490f06dd75de0abe Mon Sep 17 00:00:00 2001 From: Rajasegar Date: Wed, 30 Dec 2020 12:11:20 +0530 Subject: [PATCH] chore: use loader aliases when using require calls --- addon/resolvers/classic/index.js | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/addon/resolvers/classic/index.js b/addon/resolvers/classic/index.js index 7643470b..fb2e05af 100644 --- a/addon/resolvers/classic/index.js +++ b/addon/resolvers/classic/index.js @@ -1,4 +1,4 @@ -/* globals requirejs, require */ +/* globals requirejs, require, loader */ import Ember from 'ember'; import { assert, deprecate, warn } from '@ember/debug'; @@ -13,7 +13,11 @@ if (typeof requirejs.entries === 'undefined') { export class ModuleRegistry { constructor(entries) { - this._entries = entries || requirejs.entries; + if(loader.__aliases && loader.__aliases.requirejs) { + this._entries = entries || window[loader.__aliases.requirejs].entries; + } else { + this._entries = entries || requirejs.entries; + } } moduleNames() { return Object.keys(this._entries); @@ -466,7 +470,13 @@ const Resolver = EmberObject.extend({ }, _extractDefaultExport(normalizedModuleName) { - let module = require(normalizedModuleName, null, null, true /* force sync */); + + let module; + if(loader.__aliases && loader.__aliases.require) { + module = window[loader.__aliases.require](normalizedModuleName, null, null, true /* force sync */); + } else { + module = require(normalizedModuleName, null, null, true /* force sync */); + } if (module && module['default']) { module = module['default'];