Skip to content

I believe this (along with the original PR#252) fully corrects the original issue #227 as well as the regression #382. #504

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
merged 4 commits into from
May 19, 2017
Merged

I believe this (along with the original PR#252) fully corrects the original issue #227 as well as the regression #382. #504

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8680d9c
I believe this (along with the original PR#252) fully corrects the or…
cpriest May 15, 2017
3fb7d7c
Updates to use plugin method for theme.js (breaks backward compatibil…
cpriest May 17, 2017
b1caa70
Update the `require` and error thrown
blakeembrey May 18, 2017
b285cbb
Shit happens when editing in GitHub UI
blakeembrey May 18, 2017
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
16 changes: 15 additions & 1 deletion src/lib/output/renderer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,21 @@ export class Renderer extends ChildableComponent<Application, RendererComponent>
}
}

this.theme = this.addComponent('theme', new DefaultTheme(this, path));
const filename = Path.join(path, 'theme.js');
if (!FS.existsSync(filename)) {
this.theme = this.addComponent('theme', new DefaultTheme(this, path));
} else {
try {
const themeClass = typeof require(filename) === 'function' ? require(filename) : require(filename).default;

this.theme = this.addComponent('theme', new (themeClass)(this, path));
} catch (err) {
throw new Error(
`Exception while loading "${filename}". You must export a \`new Theme(renderer, basePath)\` compatible class.\n` +
err
);
}
}
}

this.theme.resources.activate();
Expand Down