Skip to content

Commit 30da677

Browse files
committed
fix: add warning message for ember-source below v4.1
1 parent 5448fe0 commit 30da677

File tree

3 files changed

+27
-14
lines changed

3 files changed

+27
-14
lines changed

ember-engines-router-service/package.json

+6-2
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,8 @@
3636
"start": "rollup --config --watch"
3737
},
3838
"dependencies": {
39-
"@embroider/addon-shim": "^1.8.4"
39+
"@embroider/addon-shim": "^1.8.4",
40+
"@embroider/macros": "^1.13.2"
4041
},
4142
"devDependencies": {
4243
"@babel/core": "^7.20.7",
@@ -55,8 +56,11 @@
5556
"prettier": "^2.8.1",
5657
"rollup": "^3.8.1"
5758
},
59+
"peerDependencies": {
60+
"ember-source": "^3.28.0 || ^4.0.0"
61+
},
5862
"engines": {
59-
"node": "14.* || 16.* || >= 18"
63+
"node": "16.* || 18.* || >= 20"
6064
},
6165
"publishConfig": {
6266
"registry": "https://registry.npmjs.org"

ember-engines-router-service/src/services/engine-router-service.js

+20-11
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import { action, computed } from '@ember/object';
55
import { reads } from '@ember/object/computed';
66
import { getOwner } from '@ember/application';
77
import Evented from '@ember/object/evented';
8+
import { macroCondition, dependencySatisfies } from '@embroider/macros';
89
import { namespaceEngineRouteName } from '../utils/namespace-engine-route-name';
910
import { getRootOwner } from '../utils/root-owner';
1011
import { resemblesURL } from '../utils/resembles-url';
@@ -66,21 +67,29 @@ export default class EngineRouterService extends Service.extend(Evented) {
6667
}
6768

6869
refresh(routeName = this.currentRouteName, ...args) {
69-
if (resemblesURL(routeName)) {
70-
return this.externalRouter.refresh(routeName);
70+
if (macroCondition(dependencySatisfies('ember-source', '>= 4.1.0'))) {
71+
if (resemblesURL(routeName)) {
72+
return this.externalRouter.refresh(routeName);
73+
}
74+
75+
return this.externalRouter.refresh(
76+
namespaceEngineRouteName(this._mountPoint, routeName),
77+
...args
78+
);
79+
} else {
80+
assert('Refresh method is not available in ember-source below v4.1');
7181
}
72-
73-
return this.externalRouter.refresh(
74-
namespaceEngineRouteName(this._mountPoint, routeName),
75-
...args
76-
);
7782
}
7883

7984
refreshExternal(routeName, ...args) {
80-
return this.externalRouter.refresh(
81-
this.getExternalRouteName(routeName),
82-
...args
83-
);
85+
if (macroCondition(dependencySatisfies('ember-source', '>= 4.1.0'))) {
86+
return this.externalRouter.refresh(
87+
this.getExternalRouteName(routeName),
88+
...args
89+
);
90+
} else {
91+
assert('Refresh method is not available in ember-source below v4.1');
92+
}
8493
}
8594

8695
transitionTo(routeName, ...args) {

yarn.lock

+1-1
Original file line numberDiff line numberDiff line change
@@ -1189,7 +1189,7 @@
11891189
typescript-memoize "^1.0.1"
11901190
walk-sync "^3.0.0"
11911191

1192-
"@embroider/macros@1.13.2", "@embroider/macros@^1.0.0", "@embroider/macros@^1.10.0", "@embroider/macros@^1.13.0", "@embroider/macros@^1.3.0":
1192+
"@embroider/macros@1.13.2", "@embroider/macros@^1.0.0", "@embroider/macros@^1.10.0", "@embroider/macros@^1.13.0", "@embroider/macros@^1.13.2", "@embroider/macros@^1.3.0":
11931193
version "1.13.2"
11941194
resolved "https://registry.yarnpkg.com/@embroider/macros/-/macros-1.13.2.tgz#07dda11313a2539f403404881b729e622a80ca17"
11951195
integrity sha512-AUgJ71xG8kjuTx8XB1AQNBiebJuXRfhcHr318dCwnQz9VRXdYSnEEqf38XRvGYIoCvIyn/3c72LrSwzaJqknOA==

0 commit comments

Comments
 (0)