Skip to content

Fix addon docs build #42

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ryanto merged 4 commits into from
Apr 27, 2019
Merged

Fix addon docs build #42

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ae96636
move 404 route
ryanto Apr 27, 2019
3dbb861
rerun addon docs generator
ryanto Apr 27, 2019
aa490bc
run docs generator, move route, update some dependencies
ryanto Apr 27, 2019
7ec9e2e
enable if the app is named dummy
ryanto Apr 27, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion config/addon-docs.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@
const AddonDocsConfig = require('ember-cli-addon-docs/lib/config');

module.exports = class extends AddonDocsConfig {
// See https://ember-learn.github.io/ember-cli-addon-docs/latest/docs/deploying
// See https://ember-learn.github.io/ember-cli-addon-docs/docs/deploying
// for details on configuration you can override here.
};
7 changes: 6 additions & 1 deletion index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,12 @@ module.exports = {
},

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

included() {
Expand Down
3 changes: 1 addition & 2 deletions tests/dummy/app/router.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,9 @@ Router.map(function() {
this.route('throw-error-object');
this.route('access-document');
});

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

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

export default Router;
6 changes: 3 additions & 3 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7756,9 +7756,9 @@ jsesc@~0.5.0:
integrity sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=

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