Skip to content

Commit 827c292

Browse files
committed
load
1 parent 3a14151 commit 827c292

File tree

2 files changed

+81
-24
lines changed

2 files changed

+81
-24
lines changed

ember_debug/utils/ember.js

+69-22
Original file line numberDiff line numberDiff line change
@@ -10,25 +10,37 @@ try {
1010

1111
let {
1212
Namespace,
13-
ActionHandler,
13+
_captureRenderTree: captureRenderTree,
1414
ControllerMixin,
1515
CoreObject,
1616
Application,
1717
MutableArray,
1818
MutableEnumerable,
1919
NativeArray,
20-
Component,
20+
Component: EmberComponent,
2121
Observable,
2222
Evented,
2323
PromiseProxyMixin,
2424
Object: EmberObject,
2525
VERSION,
26-
ComputedProperty,
2726
meta,
2827
get,
2928
set,
3029
runloop,
31-
computed,
30+
cacheFor,
31+
metal,
32+
guidFor,
33+
getOwner,
34+
isTrackedProperty,
35+
isCachedProperty,
36+
isMandatorySetter,
37+
isTesting,
38+
inspect,
39+
registerDeprecationHandler,
40+
TargetActionSupport,
41+
GlimmerComponent,
42+
instrumentation,
43+
RSVP,
3244
} = Ember || {};
3345

3446
if (!Ember) {
@@ -39,39 +51,76 @@ if (!Ember) {
3951
ControllerMixin = emberSafeRequire('@ember/controller')?.ControllerMixin;
4052
CoreObject = emberSafeRequire('@ember/object/core')?.default;
4153
Application = emberSafeRequire('@ember/application')?.default;
42-
Component = emberSafeRequire('@ember/component')?.default;
54+
EmberComponent = emberSafeRequire('@ember/component')?.default;
55+
GlimmerComponent = emberSafeRequire('@glimmer/component')?.default;
4356
Observable = emberSafeRequire('@ember/object/observable')?.default;
4457
Evented = emberSafeRequire('@ember/object/evented')?.default;
4558
PromiseProxyMixin = emberSafeRequire(
4659
'@ember/object/promise-proxy-mixin'
4760
)?.default;
4861
EmberObject = emberSafeRequire('@ember/object')?.default;
4962
VERSION = emberSafeRequire('ember/version')?.default;
50-
metal = emberSafeRequire(
51-
'@ember/-internals/metal'
52-
);
63+
metal = emberSafeRequire('@ember/-internals/metal');
64+
TargetActionSupport = emberSafeRequire(
65+
'@ember/-internals/runtime'
66+
)?.TargetActionSupport;
5367
meta = emberSafeRequire('@ember/-internals/meta')?.meta;
5468
set = emberSafeRequire('@ember/object')?.set;
5569
get = emberSafeRequire('@ember/object')?.get;
5670
runloop = emberSafeRequire('@ember/runloop');
57-
cacheFor = emberSafeRequire('@ember/object/internals').cacheFor;
58-
guidFor = emberSafeRequire('@ember/object/internals').guidFor;
59-
getOwner = emberSafeRequire('@ember/owner').getOwner;
71+
cacheFor = emberSafeRequire('@ember/object/internals')?.cacheFor;
72+
guidFor = emberSafeRequire('@ember/object/internals')?.guidFor;
73+
getOwner = emberSafeRequire('@ember/owner')?.getOwner;
74+
inspect =
75+
emberSafeRequire('@ember/debug')?.inspect ||
76+
emberSafeRequire('@ember/-internals/utils')?.inspect;
77+
registerDeprecationHandler =
78+
emberSafeRequire('@ember/debug')?.registerDeprecationHandler;
79+
instrumentation = emberSafeRequire('@ember/instrumentation');
80+
RSVP = emberSafeRequire('rsvp');
81+
}
82+
83+
const {
84+
ComputedProperty,
85+
isComputed,
86+
descriptorForProperty,
87+
descriptorForDecorator,
88+
tagForProperty,
89+
} = (metal || {});
90+
91+
const { _backburner, cancel, debounce, join, later, scheduleOnce } = (runloop || {});
92+
const {
93+
ViewStateSupport,
94+
ViewMixin,
95+
ActionSupport,
96+
ClassNamesSupport,
97+
ChildViewsSupport,
98+
CoreView,
99+
} = emberSafeRequire('@ember/-internals/views') || Ember || {};
100+
101+
const GlimmerValidator = emberSafeRequire('@glimmer/validator');
102+
const GlimmerRuntime = emberSafeRequire('@glimmer/runtime');
103+
104+
export function assignEmberInfo(data) {
105+
Object.assign(ember, data);
60106
}
61107

62-
const { ComputedProperty, isComputed, descriptorForProperty, descriptorForDecorator, tagForProperty } = metal;
63-
const { _backburner, cancel, debounce, join, later, scheduleOnce } = runloop;
64-
export const ember = {
108+
export const ember = {
65109
runloop: {
66-
_backburner, cancel, debounce, join, later, scheduleOnce
110+
_backburner,
111+
cancel,
112+
debounce,
113+
join,
114+
later,
115+
scheduleOnce,
67116
},
68117
object: {
69118
cacheFor,
70119
guidFor,
71120
getOwner,
72121
set,
73122
get,
74-
meta
123+
meta,
75124
},
76125
debug: {
77126
isComputed,
@@ -105,20 +154,18 @@ export const ember = {
105154
PromiseProxyMixin,
106155
},
107156
VERSION,
108-
instrumentation: {
109-
subscribe
110-
},
157+
instrumentation: instrumentation,
111158
Views: {
112159
ViewStateSupport,
113160
ViewMixin,
114161
ActionSupport,
115162
ClassNamesSupport,
116163
ChildViewsSupport,
117-
CoreView
164+
CoreView,
118165
},
119166
GlimmerValidator,
120167
GlimmerRuntime,
121-
RSVP
122-
}
168+
RSVP,
169+
};
123170

124171
export default Ember;

ember_debug/vendor/startup-wrapper.js

+12-2
Original file line numberDiff line numberDiff line change
@@ -105,11 +105,19 @@ var EMBER_VERSIONS_SUPPORTED = {{EMBER_VERSIONS_SUPPORTED}};
105105

106106
function onEmberReady(callback) {
107107
var triggered = false;
108-
var triggerOnce = function(string) {
108+
const event = new Event("ember-inspector-debug-request");
109+
var triggerOnce = function(e) {
109110
if (triggered) {
110111
return;
111112
}
112113

114+
if (e && typeof e.detail === 'object') {
115+
triggered = true;
116+
requireModule('ember-debug/utils/ember').assignEmberInfo(e.detail);
117+
callback();
118+
}
119+
window.dispatchEvent(event);
120+
113121
if (!Ember) {
114122
try {
115123
Ember = requireModule('ember')['default'];
@@ -132,8 +140,10 @@ var EMBER_VERSIONS_SUPPORTED = {{EMBER_VERSIONS_SUPPORTED}};
132140

133141
// Newest Ember versions >= 1.10
134142

135-
const later = () => setTimeout(triggerOnce, 0);
143+
const later = (data) => setTimeout(() => triggerOnce(data), 0);
136144
window.addEventListener('Ember', later, { once: true });
145+
window.addEventListener('ember-inspector-debug-response', later, { once: true });
146+
window.dispatchEvent(event);
137147
// Oldest Ember versions or if this was injected after Ember has loaded.
138148
onReady(triggerOnce);
139149
}

0 commit comments

Comments
 (0)