require all ember modules in one place (#2628)

Author: mansona

ember_debug/utils/ember.js

@@ -42,6 +42,13 @@ let {
 
 let getEnv = () => Ember.ENV;
 
+let Debug = emberSafeRequire('@ember/debug')?.default;
+let InternalsUtils = emberSafeRequire('@ember/-internals/utils')?.default;
+let ObjectInternals = emberSafeRequire('@ember/object/internals')?.default;
+let Instrumentation = emberSafeRequire('@ember/instrumentation')?.default;
+let RSVP = emberSafeRequire('rsvp')?.default;
+let Runloop = emberSafeRequire('@ember/runloop')?.default;
+
 if (!Ember) {
   captureRenderTree = emberSafeRequire('@ember/debug')?.captureRenderTree;
   getEnv = emberSafeRequire('@ember/-internals/environment')?.getENV;
@@ -72,6 +79,12 @@ if (!Ember) {
 }
 
 export {
+  Runloop,
+  Debug,
+  InternalsUtils,
+  ObjectInternals,
+  Instrumentation,
+  RSVP,
   ArrayProxy,
   Namespace,
   ActionHandler,

ember_debug/utils/ember/debug.js

@@ -1,13 +1,12 @@
-import Ember from '../ember';
+import Ember, { Debug, InternalsUtils } from '../ember';
 
 let module;
-
 export let inspect;
 
-try {
-  module = requireModule('@ember/debug');
-  inspect = module.inspect || requireModule('@ember/-internals/utils').inspect;
-} catch {
+if (Debug) {
+  module = Debug;
+  inspect = Debug.inspect || InternalsUtils.inspect;
+} else {
   module = Ember.Debug;
   // eslint-disable-next-line ember/new-module-imports
   inspect = Ember.inspect;

ember_debug/utils/ember/instrumentation.js

@@ -1,10 +1,10 @@
-import Ember from '../ember';
+import Ember, { Instrumentation } from '../ember';
 
 let module;
 
-try {
-  module = requireModule('@ember/instrumentation');
-} catch {
+if (Instrumentation) {
+  module = Instrumentation;
+} else {
   module = Ember;
 }
 

ember_debug/utils/ember/object/internals.js

@@ -1,10 +1,10 @@
-import Ember from '../../ember';
+import Ember, { ObjectInternals } from '../../ember';
 
 let module;
 
-try {
-  module = requireModule('@ember/object/internals');
-} catch {
+if (ObjectInternals) {
+  module = ObjectInternals;
+} else {
   module = Ember;
 }
 

ember_debug/utils/ember/runloop.js

@@ -1,21 +1,21 @@
-import Ember from '../ember';
+import Ember, { Runloop as EmberRunloop } from '../ember';
 import * as runloop from './own-runloop';
 
+// it could happen that runloop is available but _backburner is not exported (dead code)
+// then we need to use our own.
 let module = runloop;
 let _backburner = runloop._backburner;
 
 const keys = ['cancel', 'debounce', 'join', 'later', 'scheduleOnce'];
 
-try {
-  module = requireModule('@ember/runloop');
-  // it could happen that runloop is available but _backburner is not exported (dead code)
-  // then we need to use our own
-  _backburner = module._backburner;
-} catch {
-  // eslint-disable-next-line ember/new-module-imports
-  _backburner = Ember?.run?.backburner || module._backburner;
+if (EmberRunloop) {
+  module = EmberRunloop;
+  _backburner = EmberRunloop._backburner;
+} else {
   // eslint-disable-next-line ember/new-module-imports
   module = Ember?.run || module;
+  // eslint-disable-next-line ember/new-module-imports
+  _backburner = Ember?.run?.backburner || _backburner;
 }
 
 if (!keys.every((k) => k in module)) {

ember_debug/utils/rsvp.js

@@ -1,21 +1,14 @@
-import Ember from './ember';
+import Ember, { RSVP as emberRSVP } from './ember';
 
-let module, RSVP;
+let module;
 
-try {
-  module = requireModule('rsvp');
-  RSVP = module.default;
-
-  // The RSVP module should have named exports for `Promise`, etc,
-  // but some old versions do not and provide `RSVP.Promise`, etc.
-  if (!('Promise' in module)) {
-    module = RSVP;
-  }
-} catch {
+if (emberRSVP) {
+  module = emberRSVP;
+} else {
   // eslint-disable-next-line ember/new-module-imports
-  module = RSVP = Ember.RSVP;
+  module = Ember.RSVP;
 }
 
 export let { Promise, all, resolve } = module;
 
-export default RSVP;
+export default module;