Skip to content

Commit 957d26b

Browse files
authored
Merge pull request #973 from ember-cli/do-not-use-global-ember
Do not use global ember -- drop support for ember-source < 4.12
2 parents dc8e1a8 + fdd1e4a commit 957d26b

File tree

9 files changed

+77
-135
lines changed

9 files changed

+77
-135
lines changed

.github/workflows/ci-build.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,6 @@ jobs:
6666
fail-fast: false
6767
matrix:
6868
ember-try-scenario:
69-
- ember-lts-4.4
70-
- ember-lts-4.8
7169
- ember-lts-4.12
7270
- ember-lts-5.4
7371
- ember-lts-5.8

addon/addon/index.js

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
/* globals requirejs, require */
22

3-
import Ember from 'ember';
43
import { assert, deprecate, warn } from '@ember/debug';
54
import EmberObject from '@ember/object';
65
import { dasherize, classify, underscore } from './string';
76
import { DEBUG } from '@glimmer/env';
87
import classFactory from './utils/class-factory';
98

9+
import { getOwner } from '@ember/owner';
10+
1011
if (typeof requirejs.entries === 'undefined') {
1112
requirejs.entries = requirejs._eak_seen;
1213
}
@@ -293,11 +294,7 @@ class Resolver extends EmberObject {
293294
}
294295

295296
resolveTemplate(parsedName) {
296-
let resolved = this.resolveOther(parsedName);
297-
if (resolved == null) {
298-
resolved = Ember.TEMPLATES[parsedName.fullNameWithoutType];
299-
}
300-
return resolved;
297+
return this.resolveOther(parsedName);
301298
}
302299

303300
mainModuleName(parsedName) {
@@ -459,7 +456,9 @@ class Resolver extends EmberObject {
459456

460457
// only needed until 1.6.0-beta.2 can be required
461458
_logLookup(found, parsedName, description) {
462-
if (!Ember.ENV.LOG_MODULE_RESOLVER && !parsedName.root.LOG_RESOLVER) {
459+
let owner = getOwner(this);
460+
let env = owner?.resolveRegistration?.('config:environment');
461+
if (!env?.LOG_MODULE_RESOLVER && !parsedName.root.LOG_RESOLVER) {
463462
return;
464463
}
465464

addon/package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
"dependencies": {
2626
"ember-cli-babel": "^7.26.11"
2727
},
28-
"devDependencies": {},
2928
"peerDependencies": {
3029
"ember-source": "^4.8.3 || >= 5.0.0"
3130
},

0 commit comments

Comments
 (0)