Skip to content

Commit 84ebb44

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

File tree

3 files changed

+30
-14
lines changed

3 files changed

+30
-14
lines changed

ember-engines-router-service/package.json

+3-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",
@@ -56,7 +57,7 @@
5657
"rollup": "^3.8.1"
5758
},
5859
"engines": {
59-
"node": "14.* || 16.* || >= 18"
60+
"node": "16.* || 18.* || >= 20"
6061
},
6162
"publishConfig": {
6263
"registry": "https://registry.npmjs.org"

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

+26-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 { 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,35 @@ 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+
console.log('hello', dependencySatisfies('ember-source', '>= 4.1.0'));
71+
if (dependencySatisfies('ember-source', '^4.1.0')) {
72+
if (resemblesURL(routeName)) {
73+
return this.externalRouter.refresh(routeName);
74+
}
75+
76+
return this.externalRouter.refresh(
77+
namespaceEngineRouteName(this._mountPoint, routeName),
78+
...args
79+
);
80+
} else {
81+
assert(
82+
`Refresh method is not available in ember-source below v4.1 ${dependencySatisfies(
83+
'ember-source',
84+
'^4.1.0'
85+
)}`
86+
);
7187
}
72-
73-
return this.externalRouter.refresh(
74-
namespaceEngineRouteName(this._mountPoint, routeName),
75-
...args
76-
);
7788
}
7889

7990
refreshExternal(routeName, ...args) {
80-
return this.externalRouter.refresh(
81-
this.getExternalRouteName(routeName),
82-
...args
83-
);
91+
if (dependencySatisfies('ember-source', '>= 4.1.0')) {
92+
return this.externalRouter.refresh(
93+
this.getExternalRouteName(routeName),
94+
...args
95+
);
96+
} else {
97+
assert('Refresh method is not available in ember-source below v4.1');
98+
}
8499
}
85100

86101
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)