Skip to content
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

Jump to bottom

chore: fix docs build #6635

Merged
merged 4 commits into from
Dec 27, 2021
Merged

chore: fix docs build #6635

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
adad5a6
chore: fix docs build
jakovljevic-mladen Oct 8, 2021
23c7e52
chore: update remark version and revert remark-html version
jakovljevic-mladen Oct 11, 2021
951f584
chore: remove rehype
jakovljevic-mladen Oct 21, 2021
7a811d5
chore: fix docs app console errors
jakovljevic-mladen Oct 24, 2021
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
265 changes: 109 additions & 156 deletions docs_app/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions docs_app/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,9 +118,8 @@
"lunr": "^2.1.0",
"mkdirp": "^0.5.1",
"protractor": "~7.0.0",
"rehype": "^10.0.0",
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This was removed in #6470, but was reintroduced with #6566, most probably by the wrong conflict resolve. I removed it once again.

"rehype-slug": "^2.0.3",
"remark": "^10.0.1",
"remark": "^12.0.1",
"remark-html": "^13.0.2",
"rimraf": "^2.6.1",
"semver": "^6.1.1",
Expand Down
2 changes: 1 addition & 1 deletion docs_app/tools/transforms/remark-package/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@ var Package = require('dgeni').Package;
* @description Overrides the renderMarkdown service with an implementation based on remark
*/
module.exports = new Package('remark', ['nunjucks'])

.factory(require('./services/markedNunjucksFilter'))
.factory(require('./services/renderMarkdown'));
12 changes: 12 additions & 0 deletions docs_app/tools/transforms/remark-package/services/markedNunjucksFilter.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
/**
* Convert the value, as markdown, into HTML
* @param headingMappings A map of headings to convert (e.g. from h3 to h4).
*/
module.exports = function markedNunjucksFilter(renderMarkdown) {
return {
name: 'marked',
process: function(str, headingMappings) {
return str && renderMarkdown(str, headingMappings);
}
};
};
Loading