Skip to content

Commit 9d1a025

Browse files
committed
Use @embroider/macros to chose the correct get/set Owner api
1 parent 1b552a2 commit 9d1a025

File tree

5 files changed

+83
-98
lines changed

5 files changed

+83
-98
lines changed

addon/addon/index.js

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,19 @@ 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 { getOwner } from '@ember/owner';
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+
}
921

1022
import { TEMPLATES } from './template-cache';
1123

addon/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@
2323
},
2424
"scripts": {},
2525
"dependencies": {
26+
"@embroider/macros": "^1.16.2",
2627
"ember-cli-babel": "^7.26.11"
2728
},
28-
"devDependencies": {},
2929
"peerDependencies": {
3030
"ember-source": "^4.8.3 || >= 5.0.0"
3131
},

0 commit comments

Comments
 (0)