Skip to content

Commit 7497979

Browse files
committed
Support only 4.12 (LTS) or higher, delete a bunch of code, remove macros, etc
1 parent 9d1a025 commit 7497979

File tree

7 files changed

+4
-61
lines changed

7 files changed

+4
-61
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: 2 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -5,21 +5,8 @@ import EmberObject from '@ember/object';
55
import { dasherize, classify, underscore } from './string';
66
import { DEBUG } from '@glimmer/env';
77
import classFactory from './utils/class-factory';
8-
import {
9-
macroCondition,
10-
dependencySatisfies,
11-
importSync,
12-
} from '@embroider/macros';
13-
14-
let getOwner;
15-
16-
if (macroCondition(dependencySatisfies('ember-source', '>= 4.11'))) {
17-
getOwner = importSync('@ember/owner').getOwner;
18-
} else {
19-
getOwner = importSync('@ember/application').getOwner;
20-
}
218

22-
import { TEMPLATES } from './template-cache';
9+
import { getOwner } from '@ember/owner';
2310

2411
if (typeof requirejs.entries === 'undefined') {
2512
requirejs.entries = requirejs._eak_seen;
@@ -307,11 +294,7 @@ class Resolver extends EmberObject {
307294
}
308295

309296
resolveTemplate(parsedName) {
310-
let resolved = this.resolveOther(parsedName);
311-
if (resolved == null) {
312-
resolved = TEMPLATES[parsedName.fullNameWithoutType];
313-
}
314-
return resolved;
297+
return this.resolveOther(parsedName);
315298
}
316299

317300
mainModuleName(parsedName) {

addon/addon/template-cache.js

Lines changed: 0 additions & 8 deletions
This file was deleted.

addon/package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
},
2424
"scripts": {},
2525
"dependencies": {
26-
"@embroider/macros": "^1.16.2",
2726
"ember-cli-babel": "^7.26.11"
2827
},
2928
"peerDependencies": {

package-lock.json

Lines changed: 1 addition & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

test-app/config/ember-try.js

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -42,22 +42,6 @@ module.exports = async function () {
4242
},
4343

4444
scenarios: [
45-
{
46-
name: 'ember-lts-4.4',
47-
npm: {
48-
devDependencies: {
49-
'ember-source': '~4.4.0',
50-
},
51-
},
52-
},
53-
{
54-
name: 'ember-lts-4.8',
55-
npm: {
56-
devDependencies: {
57-
'ember-source': '~4.8.0',
58-
},
59-
},
60-
},
6145
{
6246
name: 'ember-lts-4.12',
6347
npm: {

test-app/tests/unit/resolvers/classic/-setup-resolver.js

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,6 @@
11
import Resolver, { ModuleRegistry } from 'ember-resolver';
2-
import {
3-
macroCondition,
4-
dependencySatisfies,
5-
importSync,
6-
} from '@embroider/macros';
72

8-
let setOwner;
9-
10-
if (macroCondition(dependencySatisfies('ember-source', '>= 4.11'))) {
11-
setOwner = importSync('@ember/owner').setOwner;
12-
} else {
13-
setOwner = importSync('@ember/application').setOwner;
14-
}
3+
import { setOwner } from '@ember/owner';
154

165
export let resolver;
176
export let loader;

0 commit comments

Comments
 (0)