From f016daf9dbe8f453aeff073c3b7fbf0d56552913 Mon Sep 17 00:00:00 2001 From: Edward Faulkner Date: Wed, 3 Jan 2024 15:58:29 -0500 Subject: [PATCH] [CLEANUP canary] Remove final eager consumption of AMD loader This is the last place where Ember treats the AMD loader as mandatory. After this change I have Ember's whole test suite passing with no AMD loader! --- packages/ember/index.ts | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/packages/ember/index.ts b/packages/ember/index.ts index 4b9e2a8ed8f..89436fd3743 100644 --- a/packages/ember/index.ts +++ b/packages/ember/index.ts @@ -506,8 +506,10 @@ namespace Ember { get define() { return (globalThis as any).define; }, - // @ts-expect-error These properties don't appear as being defined - registry: typeof requirejs !== 'undefined' ? requirejs.entries : require.entries, + get registry() { + let g = globalThis as any; + return g.requirejs?.entries ?? g.require.entries; + }, }; // ------------------------------------------------------------------------ //