fix

emberjs · Jun 11, 2024 · 37198f6 · 37198f6
1 parent 1684059
commit 37198f6
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/ember_debug/adapters/web-extension.js b/ember_debug/adapters/web-extension.js
@@ -1,7 +1,7 @@
 import BasicAdapter from './basic';
 import { typeOf } from 'ember-debug/utils/type-check';
 
-import Ember, { ENV } from 'ember-debug/utils/ember';
+import { ember } from 'ember-debug/utils/ember';
 import { run } from 'ember-debug/utils/ember/runloop';
 
 const { isArray } = Array;
@@ -105,7 +105,7 @@ export default class extends BasicAdapter {
 // adapter later. See GH #1114.
 const HAS_ARRAY_PROTOTYPE_EXTENSIONS = (() => {
   try {
-    return ENV.EXTEND_PROTOTYPES.Array === true;
+    return ember.env.EXTEND_PROTOTYPES.Array === true;
   } catch (e) {
     return false;
   }

diff --git a/ember_debug/utils/ember-object-names.js b/ember_debug/utils/ember-object-names.js
@@ -25,7 +25,7 @@ try {
   emberNames.set(Views.ClassNamesSupport, 'ClassNamesSupport Mixin');
   emberNames.set(Views.ChildViewsSupport, 'ChildViewsSupport Mixin');
   emberNames.set(Views.ViewStateSupport, 'ViewStateSupport  Mixin');
-  emberNames.set(TargetActionSupport, 'TargetActionSupport Mixin')
+  emberNames.set(classes.TargetActionSupport, 'TargetActionSupport Mixin')
   // this one is not a Mixin, but an .extend({}), which results in a class
   emberNames.set(Views.CoreView, 'CoreView');
 } catch (e) {

diff --git a/ember_debug/utils/ember.js b/ember_debug/utils/ember.js
@@ -49,7 +49,6 @@ let {
   ENV: ENV_,
 } = Ember || {};
 
-let getEnv = () => Ember.ENV;
 let cacheFor = () => null;
 
 if (!Ember) {

diff --git a/ember_debug/vendor/startup-wrapper.js b/ember_debug/vendor/startup-wrapper.js
@@ -1,3 +1,5 @@
+import { object } from 'ember-debug/utils/ember';
+
 let Ember;
 let guidFor;
 
@@ -125,7 +127,7 @@ let EMBER_VERSIONS_SUPPORTED = {{EMBER_VERSIONS_SUPPORTED}};
 
       Ember = requireModule('ember-debug/utils/ember');
 
-      if (!Ember.VERSION) {
+      if (!Ember.ember.VERSION) {
         return;
       }
       // `Ember.Application` load hook triggers before all of Ember is ready.
@@ -164,7 +166,7 @@ let EMBER_VERSIONS_SUPPORTED = {{EMBER_VERSIONS_SUPPORTED}};
 
       if (message.type === 'app-selected') {
         let current = window.EmberInspector._application;
-        let selected = getApplications().find(app => guidFor(app) === message.applicationId);
+        let selected = getApplications().find(app => Ember.object.guidFor(app) === message.applicationId);
 
         if (selected && current !== selected && selected.__deprecatedInstance__) {
           bootEmberInspector(selected.__deprecatedInstance__);