load

Author: patricklx

ember_debug/utils/ember.js

@@ -11,14 +11,14 @@ try {
 let {
   ArrayProxy,
   Namespace,
-  ActionHandler,
+  _captureRenderTree: captureRenderTree,
   ControllerMixin,
   CoreObject,
   Application,
   MutableArray,
   MutableEnumerable,
   NativeArray,
-  Component,
+  Component: EmberComponent,
   Observable,
   Evented,
   PromiseProxyMixin,
@@ -30,63 +30,103 @@ let {
   get,
   set,
   runloop,
-  computed,
-  _metal: metal,
-  _captureRenderTree: captureRenderTree,
-  inspect,
+  cacheFor,
+  metal,
+  guidFor,
   getOwner,
+  isTrackedProperty,
+  isCachedProperty,
+  isMandatorySetter,
+  isTesting,
+  inspect,
+  registerDeprecationHandler,
+  TargetActionSupport,
+  GlimmerComponent,
+  instrumentation,
+  RSVP,
 } = Ember || {};
 
 let getEnv = () => Ember.ENV;
 let cacheFor = () => null;
 
 if (!Ember) {
-  captureRenderTree = emberSafeRequire('@ember/debug')?.captureRenderTree;
-  getEnv = emberSafeRequire('@ember/-internals/environment')?.getENV;
-  ArrayProxy = emberSafeRequire('@ember/array/proxy')?.default;
-  ObjectProxy = emberSafeRequire('@ember/object/proxy')?.default;
   MutableArray = emberSafeRequire('@ember/array/mutable')?.default;
   Namespace = emberSafeRequire('@ember/application/namespace')?.default;
   MutableEnumerable = emberSafeRequire('@ember/enumerable/mutable')?.default;
   NativeArray = emberSafeRequire('@ember/array')?.NativeArray;
   ControllerMixin = emberSafeRequire('@ember/controller')?.ControllerMixin;
   CoreObject = emberSafeRequire('@ember/object/core')?.default;
   Application = emberSafeRequire('@ember/application')?.default;
-  Component = emberSafeRequire('@ember/component')?.default;
+  EmberComponent = emberSafeRequire('@ember/component')?.default;
+  GlimmerComponent = emberSafeRequire('@glimmer/component')?.default;
   Observable = emberSafeRequire('@ember/object/observable')?.default;
   Evented = emberSafeRequire('@ember/object/evented')?.default;
   PromiseProxyMixin = emberSafeRequire(
     '@ember/object/promise-proxy-mixin'
   )?.default;
-  Service = emberSafeRequire('@ember/service')?.default;
   EmberObject = emberSafeRequire('@ember/object')?.default;
   VERSION = emberSafeRequire('ember/version')?.default;
-  metal = emberSafeRequire(
-    '@ember/-internals/metal'
-  );
+  metal = emberSafeRequire('@ember/-internals/metal');
+  TargetActionSupport = emberSafeRequire(
+    '@ember/-internals/runtime'
+  )?.TargetActionSupport;
   meta = emberSafeRequire('@ember/-internals/meta')?.meta;
   set = emberSafeRequire('@ember/object')?.set;
   get = emberSafeRequire('@ember/object')?.get;
   runloop = emberSafeRequire('@ember/runloop');
-  cacheFor = emberSafeRequire('@ember/object/internals').cacheFor;
-  guidFor = emberSafeRequire('@ember/object/internals').guidFor;
-  getOwner = emberSafeRequire('@ember/owner').getOwner;
-  inspect = emberSafeRequire('@ember/debug').inspect;
+  cacheFor = emberSafeRequire('@ember/object/internals')?.cacheFor;
+  guidFor = emberSafeRequire('@ember/object/internals')?.guidFor;
+  getOwner = emberSafeRequire('@ember/owner')?.getOwner;
+  inspect =
+    emberSafeRequire('@ember/debug')?.inspect ||
+    emberSafeRequire('@ember/-internals/utils')?.inspect;
+  registerDeprecationHandler =
+    emberSafeRequire('@ember/debug')?.registerDeprecationHandler;
+  instrumentation = emberSafeRequire('@ember/instrumentation');
+  RSVP = emberSafeRequire('rsvp');
 }
 
-const { ComputedProperty, isComputed, descriptorForProperty, descriptorForDecorator, tagForProperty } = metal;
-const { _backburner, cancel, debounce, join, later, scheduleOnce } = runloop;
-export const ember =  {
+const {
+  ComputedProperty,
+  isComputed,
+  descriptorForProperty,
+  descriptorForDecorator,
+  tagForProperty,
+} = (metal || {});
+
+const { _backburner, cancel, debounce, join, later, scheduleOnce } = (runloop || {});
+const {
+  ViewStateSupport,
+  ViewMixin,
+  ActionSupport,
+  ClassNamesSupport,
+  ChildViewsSupport,
+  CoreView,
+} = emberSafeRequire('@ember/-internals/views') || Ember || {};
+
+const GlimmerValidator = emberSafeRequire('@glimmer/validator');
+const GlimmerRuntime = emberSafeRequire('@glimmer/runtime');
+
+export function assignEmberInfo(data) {
+  Object.assign(ember, data);
+}
+
+export const ember = {
   runloop: {
-    _backburner, cancel, debounce, join, later, scheduleOnce
+    _backburner,
+    cancel,
+    debounce,
+    join,
+    later,
+    scheduleOnce,
   },
   object: {
     cacheFor,
     guidFor,
     getOwner,
     set,
     get,
-    meta
+    meta,
   },
   debug: {
     isComputed,
@@ -120,21 +160,19 @@ export const ember =  {
     PromiseProxyMixin,
   },
   VERSION,
-  instrumentation: {
-    subscribe
-  },
+  instrumentation: instrumentation,
   Views: {
     ViewStateSupport,
     ViewMixin,
     ActionSupport,
     ClassNamesSupport,
     ChildViewsSupport,
-    CoreView
+    CoreView,
   },
   GlimmerValidator,
   GlimmerRuntime,
   RSVP,
-  getEnv
-}
+  getEnv,
+};
 
 export default Ember;

ember_debug/vendor/startup-wrapper.js

@@ -105,11 +105,19 @@ var EMBER_VERSIONS_SUPPORTED = {{EMBER_VERSIONS_SUPPORTED}};
 
   function onEmberReady(callback) {
     var triggered = false;
-    var triggerOnce = function(string) {
+    const event = new Event("ember-inspector-debug-request");
+    var triggerOnce = function(e) {
       if (triggered) {
         return;
       }
 
+      if (e && typeof e.detail === 'object') {
+        triggered = true;
+        requireModule('ember-debug/utils/ember').assignEmberInfo(e.detail);
+        callback();
+      }
+      window.dispatchEvent(event);
+
       if (!Ember) {
         try {
           Ember = requireModule('ember')['default'];
@@ -132,8 +140,10 @@ var EMBER_VERSIONS_SUPPORTED = {{EMBER_VERSIONS_SUPPORTED}};
 
     // Newest Ember versions >= 1.10
 
-    const later = () => setTimeout(triggerOnce, 0);
+    const later = (data) => setTimeout(() => triggerOnce(data), 0);
     window.addEventListener('Ember', later, { once: true });
+    window.addEventListener('ember-inspector-debug-response', later, { once: true });
+    window.dispatchEvent(event);
     // Oldest Ember versions or if this was injected after Ember has loaded.
     onReady(triggerOnce);
   }