Skip to content

Commit a9dec4b

Browse files
committed
fix get owner issues
fix oops prettier need to wait for ember before loading
1 parent 681f18f commit a9dec4b

File tree

6 files changed

+38
-16
lines changed

6 files changed

+38
-16
lines changed
Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
import loadEmberDebugInWebpage from '../lib/load-ember-debug-in-webpage';
2-
import { onEmberReady, startInspector } from '../lib/start-inspector';
32

4-
import adapter from '../adapters/basic';
3+
loadEmberDebugInWebpage(async () => {
4+
const { onEmberReady, startInspector } = await import(
5+
'../lib/start-inspector'
6+
);
57

6-
loadEmberDebugInWebpage(() => onEmberReady(startInspector(adapter)));
8+
const adapter = (await import('../adapters/basic')).default;
9+
onEmberReady(startInspector(adapter));
10+
});
Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
import loadEmberDebugInWebpage from '../lib/load-ember-debug-in-webpage';
2-
import { onEmberReady, startInspector } from '../lib/start-inspector';
32

4-
import adapter from '../adapters/bookmarklet';
3+
loadEmberDebugInWebpage(async () => {
4+
const { onEmberReady, startInspector } = await import(
5+
'../lib/start-inspector'
6+
);
57

6-
loadEmberDebugInWebpage(() => onEmberReady(startInspector(adapter)));
8+
const adapter = (await import('../adapters/bookmarklet.js')).default;
9+
onEmberReady(startInspector(adapter));
10+
});
Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
import loadEmberDebugInWebpage from '../lib/load-ember-debug-in-webpage';
2-
import { onEmberReady, startInspector } from '../lib/start-inspector';
32

4-
import adapter from '../adapters/chrome';
3+
loadEmberDebugInWebpage(async () => {
4+
const { onEmberReady, startInspector } = await import(
5+
'../lib/start-inspector'
6+
);
57

6-
loadEmberDebugInWebpage(() => onEmberReady(startInspector(adapter)));
8+
const adapter = (await import('../adapters/chrome.js')).default;
9+
onEmberReady(startInspector(adapter));
10+
});
Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
import loadEmberDebugInWebpage from '../lib/load-ember-debug-in-webpage';
2-
import { onEmberReady, startInspector } from '../lib/start-inspector';
32

4-
import adapter from '../adapters/firefox';
3+
loadEmberDebugInWebpage(async () => {
4+
const { onEmberReady, startInspector } = await import(
5+
'../lib/start-inspector'
6+
);
57

6-
loadEmberDebugInWebpage(() => onEmberReady(startInspector(adapter)));
8+
const adapter = (await import('../adapters/firefox.js')).default;
9+
onEmberReady(startInspector(adapter));
10+
});
Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
import loadEmberDebugInWebpage from '../lib/load-ember-debug-in-webpage';
2-
import { onEmberReady, startInspector } from '../lib/start-inspector';
32

4-
import adapter from '../adapters/websocket';
3+
loadEmberDebugInWebpage(async () => {
4+
const { onEmberReady, startInspector } = await import(
5+
'../lib/start-inspector'
6+
);
57

6-
loadEmberDebugInWebpage(() => onEmberReady(startInspector(adapter)));
8+
const adapter = (await import('../adapters/websocket.js')).default;
9+
onEmberReady(startInspector(adapter));
10+
});

ember_debug/utils/ember.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,6 +203,8 @@ if (Ember) {
203203
ControllerMixin ?? emberSafeRequire('@ember/controller')?.ControllerMixin;
204204
CoreObject = CoreObject ?? emberSafeRequire('@ember/object/core')?.default;
205205
Application = Application ?? emberSafeRequire('@ember/application')?.default;
206+
ApplicationModule =
207+
ApplicationModule ?? emberSafeRequire('@ember/application');
206208
Component = Component ?? emberSafeRequire('@ember/component')?.default;
207209
Observable =
208210
Observable ?? emberSafeRequire('@ember/object/observable')?.default;
@@ -224,7 +226,7 @@ if (Ember) {
224226
if (Owner) {
225227
getOwner = Owner.getOwner;
226228
} else {
227-
getOwner = ApplicationModule.getOwner;
229+
getOwner = ApplicationModule?.getOwner || Ember.getOwner;
228230
}
229231

230232
export {

0 commit comments

Comments
 (0)