Skip to content

Commit 7d97550

Browse files
committed
enable classic ember 6 beta support
1 parent b41a1c2 commit 7d97550

File tree

3 files changed

+14
-7
lines changed

3 files changed

+14
-7
lines changed

ember_debug/utils/ember.js

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,13 @@ import { emberSafeRequire } from 'ember-debug/utils/ember/loader';
33
let Ember;
44

55
try {
6-
Ember = requireModule('ember').default;
6+
Ember = requireModule('ember/barrel').default;
7+
} catch {
8+
// pass through
9+
}
10+
11+
try {
12+
Ember = Ember || requireModule('ember').default;
713
} catch {
814
Ember = window.Ember;
915
}

ember_debug/vendor/startup-wrapper.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,10 @@ var EMBER_VERSIONS_SUPPORTED = {{EMBER_VERSIONS_SUPPORTED}};
112112

113113
if (!Ember) {
114114
try {
115-
Ember = requireModule('ember')['default'];
115+
Ember = requireModule('ember/barrel')['default'];
116+
} catch {}
117+
try {
118+
Ember = Ember || requireModule('ember')['default'];
116119
} catch {
117120
Ember = window.Ember;
118121
}

ember_debug_test_app/tests/integration/injection-test.js

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -228,9 +228,6 @@ module('Integration | Injection', function (hooks) {
228228
if (isInVersionSpecifier('~3.16.0', VERSION)) {
229229
return;
230230
}
231-
if (isInVersionSpecifier('>6.4.1', VERSION)) {
232-
return;
233-
}
234231

235232
/**
236233
* @type {ChromeApi}
@@ -343,9 +340,10 @@ module('Integration | Injection', function (hooks) {
343340

344341
test('triggering Ember Component Context Menu Item should call inspect nearest', async function (assert) {
345342
await inject(this.owner, assert);
346-
assert.timeout(10);
343+
assert.timeout(100);
347344

348-
const viewInspection = window.EmberInspector.viewDebug.viewInspection;
345+
const emberDebug = requireModule('ember-debug/main')['default'];
346+
const viewInspection = emberDebug.viewDebug.viewInspection;
349347

350348
const inspectNearestCalled = new Promise((resolve) => {
351349
viewInspection.inspectNearest = () => {

0 commit comments

Comments
 (0)