Skip to content

Commit 633f438

Browse files
authored
Merge pull request #160 from ember-learn/dont-override-mirage-config
Fail gracefully in the version selector instead of requiring Mirage.
2 parents f0ed1d7 + b8278e7 commit 633f438

File tree

6 files changed

+5
-6
lines changed

6 files changed

+5
-6
lines changed

addon/services/project-version.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,9 @@ export default Service.extend({
99
root: null,
1010

1111
_loadAvailableVersions: task(function*() {
12-
let { rootURL } = getOwner(this).resolveRegistration('config:environment');
12+
let config = getOwner(this).resolveRegistration('config:environment');
13+
let rootURL = config.rootURL;
14+
let tag = config['ember-cli-addon-docs'].packageJson.version;
1315
let slash = rootURL.indexOf('/', 1);
1416

1517
// TODO deal with apps deployed to custom domains, so their pathnames don't have a leading
@@ -19,7 +21,7 @@ export default Service.extend({
1921
this.set('current', currentFromURL || 'latest'); // dev-time guard. Think of a better way?
2022

2123
let response = yield fetch(`${this.get('root')}/versions.json`);
22-
let json = yield response.json();
24+
let json = yield response.ok ? response.json() : [{ name: 'latest', tag, sha: '12345', path: '/' }];
2325

2426
this.set('versions', Object.keys(json).map(key => {
2527
let version = json[key];

index.js

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,6 @@ module.exports = {
5454
},
5555
'ember-cli-addon-docs': {
5656
packageJson: this.parent.pkg
57-
},
58-
'ember-cli-mirage': {
59-
directory: path.resolve(this.root, path.join('addon', 'mirage'))
6057
}
6158
};
6259

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@
3636
"ember-cli-babel": "^6.11.0",
3737
"ember-cli-clipboard": "^0.8.1",
3838
"ember-cli-htmlbars": "^2.0.3",
39-
"ember-cli-mirage": "^0.4.5",
4039
"ember-cli-sass": "7.1.3",
4140
"ember-cli-string-helpers": "^1.7.0",
4241
"ember-cli-tailwind": "0.4.0",
@@ -90,6 +89,7 @@
9089
"ember-cli-eslint": "^4.2.3",
9190
"ember-cli-htmlbars-inline-precompile": "^1.0.2",
9291
"ember-cli-inject-live-reload": "^1.7.0",
92+
"ember-cli-mirage": "^0.4.5",
9393
"ember-cli-qunit": "^4.3.0",
9494
"ember-cli-shims": "^1.2.0",
9595
"ember-cli-sri": "^2.1.0",
File renamed without changes.

0 commit comments

Comments
 (0)