Skip to content

Commit

Permalink
Merge pull request #973 from ember-cli/do-not-use-global-ember
Browse files Browse the repository at this point in the history
Do not use global ember -- drop support for ember-source < 4.12
  • Loading branch information
ef4 authored Jun 7, 2024
2 parents dc8e1a8 + fdd1e4a commit 957d26b
Show file tree
Hide file tree
Showing 9 changed files with 77 additions and 135 deletions.
2 changes: 0 additions & 2 deletions .github/workflows/ci-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,6 @@ jobs:
fail-fast: false
matrix:
ember-try-scenario:
- ember-lts-4.4
- ember-lts-4.8
- ember-lts-4.12
- ember-lts-5.4
- ember-lts-5.8
Expand Down
13 changes: 6 additions & 7 deletions addon/addon/index.js
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
/* globals requirejs, require */

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

import { getOwner } from '@ember/owner';

if (typeof requirejs.entries === 'undefined') {
requirejs.entries = requirejs._eak_seen;
}
Expand Down Expand Up @@ -293,11 +294,7 @@ class Resolver extends EmberObject {
}

resolveTemplate(parsedName) {
let resolved = this.resolveOther(parsedName);
if (resolved == null) {
resolved = Ember.TEMPLATES[parsedName.fullNameWithoutType];
}
return resolved;
return this.resolveOther(parsedName);
}

mainModuleName(parsedName) {
Expand Down Expand Up @@ -459,7 +456,9 @@ class Resolver extends EmberObject {

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

Expand Down
1 change: 0 additions & 1 deletion addon/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
"dependencies": {
"ember-cli-babel": "^7.26.11"
},
"devDependencies": {},
"peerDependencies": {
"ember-source": "^4.8.3 || >= 5.0.0"
},
Expand Down
Loading

0 comments on commit 957d26b

Please sign in to comment.