Skip to content

Commit 5e1f2a6

Browse files
re-order things in utils/ember so nothing will crash if Ember is not defined
1 parent f553044 commit 5e1f2a6

File tree

1 file changed

+50
-26
lines changed

1 file changed

+50
-26
lines changed

ember_debug/utils/ember.js

Lines changed: 50 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -29,31 +29,30 @@ export function emberSafeRequire(id) {
2929
}
3030
}
3131

32-
let ArrayProxy = Ember.ArrayProxy;
33-
let Namespace = Ember.Namespace;
34-
let ActionHandler = Ember.ActionHandler;
35-
let ControllerMixin = Ember.ControllerMixin;
36-
let CoreObject = Ember.CoreObject;
37-
let Application = Ember.Application;
38-
let MutableArray = Ember.MutableArray;
39-
let MutableEnumerable = Ember.MutableEnumerable;
40-
let NativeArray = Ember.NativeArray;
41-
let Component = Ember.Component;
42-
let Observable = Ember.Observable;
43-
let Evented = Ember.Evented;
44-
let PromiseProxyMixin = Ember.PromiseProxyMixin;
45-
let Service = Ember.Service;
46-
let ObjectProxy = Ember.ObjectProxy;
47-
let VERSION = Ember.VERSION;
48-
let ComputedProperty = Ember.ComputedProperty;
49-
let meta = Ember.meta;
50-
let get = Ember.get;
51-
let set = Ember.set;
52-
let computed = Ember.computed;
53-
let EmberObject = Ember.Object;
54-
let captureRenderTree = Ember._captureRenderTree;
55-
56-
let getEnv = () => Ember.ENV;
32+
let ArrayProxy,
33+
Namespace,
34+
ActionHandler,
35+
ControllerMixin,
36+
CoreObject,
37+
Application,
38+
MutableArray,
39+
MutableEnumerable,
40+
NativeArray,
41+
Component,
42+
Observable,
43+
Evented,
44+
PromiseProxyMixin,
45+
Service,
46+
ObjectProxy,
47+
VERSION,
48+
ComputedProperty,
49+
meta,
50+
get,
51+
set,
52+
computed,
53+
EmberObject,
54+
captureRenderTree,
55+
getEnv;
5756

5857
let Debug = emberSafeRequire('@ember/debug');
5958
let InternalsMetal = emberSafeRequire('@ember/-internals/metal');
@@ -72,7 +71,32 @@ let GlimmerRuntime = emberSafeRequire('@glimmer/runtime');
7271
let GlimmerUtil = emberSafeRequire('@glimmer/util');
7372
let GlimmerValidator = emberSafeRequire('@glimmer/validator');
7473

75-
if (!Ember) {
74+
if (Ember) {
75+
captureRenderTree = Ember._captureRenderTree;
76+
getEnv = () => Ember.ENV;
77+
ArrayProxy = Ember.ArrayProxy;
78+
ObjectProxy = Ember.ObjectProxy;
79+
MutableArray = Ember.MutableArray;
80+
Namespace = Ember.Namespace;
81+
MutableEnumerable = Ember.MutableEnumerable;
82+
NativeArray = Ember.NativeArray;
83+
ControllerMixin = Ember.ControllerMixin;
84+
CoreObject = Ember.CoreObject;
85+
Application = Ember.Application;
86+
Component = Ember.Component;
87+
Observable = Ember.Observable;
88+
Evented = Ember.Evented;
89+
PromiseProxyMixin = Ember.PromiseProxyMixin;
90+
Service = Ember.Service;
91+
EmberObject = Ember.Object;
92+
VERSION = Ember.VERSION;
93+
ComputedProperty = Ember.ComputedProperty;
94+
meta = Ember.meta;
95+
get = Ember.get;
96+
set = Ember.set;
97+
computed = Ember.computed;
98+
ActionHandler = Ember.ActionHandler;
99+
} else {
76100
captureRenderTree = emberSafeRequire('@ember/debug')?.captureRenderTree;
77101
getEnv = emberSafeRequire('@ember/-internals/environment')?.getENV;
78102
ArrayProxy = emberSafeRequire('@ember/array/proxy')?.default;

0 commit comments

Comments
 (0)