Add the ability to define a default language #206
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
I don't want to have to add the language i'm working on to every single block nor do I want to rely on a default heuristic to find the language.
This adds the ability to write
```
highlight: { defaultLang: 'xxxx' }
```
in `siteConfig.js` to force the language when not specified.
I tested it without a a highlight block, without a defaultLang attribute and with one and with a wrong one. All of them work as expected.
JoelMarcey
approved these changes
Nov 1, 2017
There was a problem hiding this comment.
Cool. Thanks.
I can update https://docusaurus.io/docs/en/site-config.html to reference this new config option.
lib/core/Remarkable.js
Outdated
| @@ -42,30 +42,32 @@ class Remarkable extends React.Component { | |||
|
|
|||
| renderMarkdown(source) { | |||
| if (!this.md) { | |||
| // Allow client sites to register their own plugins | |||
| const siteConfig = require(CWD + "/siteConfig.js"); | |||
There was a problem hiding this comment.
Is there any reason not to put this up top with the other requires?
There was a problem hiding this comment.
The reason I put it there in the first place was so that if we reset the require, it's going to get a fresh version. But looks like we're not doing it yet, so right now it wouldn't make a difference: #205 (comment)
lib/core/Remarkable.js
Outdated
| @@ -42,30 +42,32 @@ class Remarkable extends React.Component { | |||
|
|
|||
| renderMarkdown(source) { | |||
| if (!this.md) { | |||
| // Allow client sites to register their own plugins | |||
There was a problem hiding this comment.
This comment may not make as much sense in this scope.
There was a problem hiding this comment.
Oops, I'll move it back
JoelMarcey
approved these changes
Nov 1, 2017
filipdanic
pushed a commit
to filipdanic/Docusaurus
that referenced
this pull request
Jan 7, 2018
JoelMarcey
pushed a commit
that referenced
this pull request
Jan 8, 2018
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
I don't want to have to add the language i'm working on to every single block nor do I want to rely on a default heuristic to find the language.
This adds the ability to write
in
siteConfig.jsto force the language when not specified.I tested it without a a highlight block, without a defaultLang attribute and with one and with a wrong one. All of them work as expected.