remove loader and export emberSafeRequire from ember util

Author: mansona

ember_debug/libs/render-tree.js

@@ -1,6 +1,6 @@
 import captureRenderTree from './capture-render-tree';
 import { guidFor } from 'ember-debug/utils/ember/object/internals';
-import { EmberLoader, emberSafeRequire } from 'ember-debug/utils/ember/loader';
+import { emberSafeRequire } from 'ember-debug/utils/ember';
 import { inspect } from 'ember-debug/utils/type-check';
 import { isInVersionSpecifier } from 'ember-debug/utils/version';
 import { VERSION } from 'ember-debug/utils/ember';
@@ -9,8 +9,8 @@ class InElementSupportProvider {
   constructor(owner) {
     this.nodeMap = new Map();
     this.remoteRoots = [];
-    this.runtime = this.require('@glimmer/runtime');
-    this.reference = this.require('@glimmer/reference');
+    this.runtime = emberSafeRequire('@glimmer/runtime');
+    this.reference = emberSafeRequire('@glimmer/reference');
     try {
       this.Wormhole = requireModule('ember-wormhole/components/ember-wormhole');
     } catch {
@@ -290,12 +290,6 @@ class InElementSupportProvider {
     );
     this.NewElementBuilderFunctions = null;
   }
-
-  require(req) {
-    return requireModule.has(req)
-      ? requireModule(req)
-      : EmberLoader.require(req);
-  }
 }
 
 export default class RenderTree {

ember_debug/object-inspector.js

@@ -17,16 +17,16 @@ import {
   ArrayProxy,
   Service,
   Component,
+  emberSafeRequire,
 } from 'ember-debug/utils/ember';
 import { cacheFor, guidFor } from 'ember-debug/utils/ember/object/internals';
 import { _backburner, join } from 'ember-debug/utils/ember/runloop';
 import emberNames from './utils/ember-object-names';
 import getObjectName from './utils/get-object-name';
-import { EmberLoader } from 'ember-debug/utils/ember/loader';
 
 const GlimmerComponent = (() => {
   try {
-    return EmberLoader.require('@glimmer/component').default;
+    return emberSafeRequire('@glimmer/component').default;
   } catch {
     // ignore, return undefined
   }
@@ -36,7 +36,7 @@ let tagValue, tagValidate, track, tagForProperty;
 
 try {
   // Try to load the most recent library
-  let GlimmerValidator = EmberLoader.require('@glimmer/validator');
+  let GlimmerValidator = emberSafeRequire('@glimmer/validator');
 
   tagValue = GlimmerValidator.value || GlimmerValidator.valueForTag;
   tagValidate = GlimmerValidator.validate || GlimmerValidator.validateTag;
@@ -73,7 +73,7 @@ try {
 } catch {
   try {
     // Fallback to the previous implementation
-    let GlimmerReference = EmberLoader.require('@glimmer/reference');
+    let GlimmerReference = emberSafeRequire('@glimmer/reference');
 
     tagValue = GlimmerReference.value;
     tagValidate = GlimmerReference.validate;
@@ -83,7 +83,7 @@ try {
 }
 
 try {
-  let metal = EmberLoader.require('@ember/-internals/metal');
+  let metal = emberSafeRequire('@ember/-internals/metal');
 
   tagForProperty = metal.tagForProperty;
   // If track was not already loaded, use metal's version (the previous version)

ember_debug/utils/ember-object-names.js

@@ -1,5 +1,5 @@
 import { compareVersion } from 'ember-debug/utils/version';
-import { emberSafeRequire } from 'ember-debug/utils/ember/loader';
+import { emberSafeRequire } from 'ember-debug/utils/ember';
 import {
   VERSION,
   ActionHandler,

ember_debug/utils/ember.js

@@ -1,6 +1,4 @@
 /* eslint-disable ember/new-module-imports */
-import { emberSafeRequire } from 'ember-debug/utils/ember/loader';
-
 let Ember;
 
 try {
@@ -15,6 +13,22 @@ try {
   Ember = window.Ember;
 }
 
+const wrappedRequire = function (id) {
+  try {
+    return Ember.__loader.require(id);
+  } catch {
+    return requireModule(id);
+  }
+};
+
+export function emberSafeRequire(id) {
+  try {
+    return wrappedRequire(id);
+  } catch {
+    return undefined;
+  }
+}
+
 let ArrayProxy = Ember.ArrayProxy;
 let Namespace = Ember.Namespace;
 let ActionHandler = Ember.ActionHandler;
@@ -41,12 +55,12 @@ let captureRenderTree = Ember._captureRenderTree;
 
 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;
+let Debug = emberSafeRequire('@ember/debug');
+let InternalsUtils = emberSafeRequire('@ember/-internals/utils');
+let ObjectInternals = emberSafeRequire('@ember/object/internals');
+let Instrumentation = emberSafeRequire('@ember/instrumentation');
+let Runloop = emberSafeRequire('@ember/runloop');
+let RSVP = emberSafeRequire('rsvp');
 
 if (!Ember) {
   captureRenderTree = emberSafeRequire('@ember/debug')?.captureRenderTree;

ember_debug/utils/ember/loader.js

@@ -1,14 +1,9 @@
 import Ember, { ObjectInternals } from '../../ember';
 
-let module;
-
-if (ObjectInternals) {
-  module = ObjectInternals;
-} else {
-  module = Ember;
-}
-
-let { cacheFor, guidFor: emberGuidFor } = module;
+// eslint-disable-next-line ember/new-module-imports
+let cacheFor = ObjectInternals?.cacheFor ?? Ember.cacheFor;
+// eslint-disable-next-line ember/new-module-imports
+let emberGuidFor = ObjectInternals?.guidFor ?? Ember.guidFor;
 
 // it can happen that different ember apps/iframes have the same id for different objects
 // since the implementation is just a counter, so we add a prefix per iframe & app

ember_debug/utils/ember/object/internals.js

@@ -10,7 +10,7 @@ const keys = ['cancel', 'debounce', 'join', 'later', 'scheduleOnce'];
 
 if (EmberRunloop) {
   module = EmberRunloop;
-  _backburner = EmberRunloop._backburner;
+  _backburner = EmberRunloop._backburner || EmberRunloop.backburner;
 } else {
   // eslint-disable-next-line ember/new-module-imports
   module = Ember?.run || module;

ember_debug/utils/ember/runloop.js

@@ -3,8 +3,8 @@ import {
   ComputedProperty,
   EmberObject,
   meta as emberMeta,
+  emberSafeRequire,
 } from 'ember-debug/utils/ember';
-import { emberSafeRequire } from 'ember-debug/utils/ember/loader';
 
 /**
  * Check if given key on the passed object is a computed property