Skip to content

Commit 8d631c9

Browse files
authored
Merge pull request #42 from embermap/fix-addon-docs-build
Fix addon docs build
2 parents e95aef3 + 7ec9e2e commit 8d631c9

4 files changed

Lines changed: 11 additions & 7 deletions

File tree

config/addon-docs.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@
44
const AddonDocsConfig = require('ember-cli-addon-docs/lib/config');
55

66
module.exports = class extends AddonDocsConfig {
7-
// See https://ember-learn.github.io/ember-cli-addon-docs/latest/docs/deploying
7+
// See https://ember-learn.github.io/ember-cli-addon-docs/docs/deploying
88
// for details on configuration you can override here.
99
};

index.js

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,12 @@ module.exports = {
1212
},
1313

1414
isEnabled() {
15-
return this.app.env !== "production";
15+
// enable this addon if were building for the dummy
16+
// app. that's because this is most likely an addon docs
17+
// build and we need this addon enabled for our docs
18+
// to deploy correctly.
19+
return this.app.name === "dummy" ||
20+
this.app.env !== "production";
1621
},
1722

1823
included() {

tests/dummy/app/router.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,9 @@ Router.map(function() {
3232
this.route('throw-error-object');
3333
this.route('access-document');
3434
});
35-
36-
this.route('not-found', { path: '/*path' });
3735
});
3836

37+
this.route('not-found', { path: '/*path' });
3938
});
4039

4140
export default Router;

yarn.lock

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7756,9 +7756,9 @@ jsesc@~0.5.0:
77567756
integrity sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=
77577757

77587758
json-api-serializer@^1.11.0:
7759-
version "1.13.0"
7760-
resolved "https://registry.yarnpkg.com/json-api-serializer/-/json-api-serializer-1.13.0.tgz#cab7239736e72abee4658b1c8915edc290f5a9e9"
7761-
integrity sha512-h5XKsQsLhN6zKLzYKFMyCuQWQZXa6Ozk4GC4svZfh8BkxdwBHidQ+zn41pHlnntexAujY/PcO+hjH92IEvGf0A==
7759+
version "1.15.0"
7760+
resolved "https://registry.yarnpkg.com/json-api-serializer/-/json-api-serializer-1.15.0.tgz#17778644e6ce0368d2604b638e0d137a144d6eea"
7761+
integrity sha512-C8nTE2kDvoTe8/2KUtP8DUI98G33n2B/hN260jA46ubnosqhkl6tBU/19yueu2qrk4a6WyoUpkXhjNQv3Mdfww==
77627762
dependencies:
77637763
into-stream "^3.1.0"
77647764
joi "^12.0.0"

0 commit comments

Comments
 (0)