Fix nunjucks view syntax #579
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
LeBenLeBen
reviewed
Apr 26, 2020
src/core/utils.js
Outdated
| default: | ||
| return fang(filePath) || { | ||
| name: name, | ||
| mode: 'text', |
There was a problem hiding this comment.
According to the issue we're having here, Highlight.js now requires this to be plaintext.
There was a problem hiding this comment.
Good point, I'll have a look at this tomorrow.
LeBenLeBen
reviewed
Apr 26, 2020
levito
force-pushed
the
fix-nunjucks-view-syntax
branch
from
756c907
to
52f61d3
Compare
fang 2.0.0 has a different return without `mode` field which is expected by fractal. This would require more changes.
levito
force-pushed
the
fix-nunjucks-view-syntax
branch
from
36f03be
to
e7f3080
Compare
mihkeleidast
approved these changes
Apr 27, 2020
|
LGTM, but let's wait for @LeBenLeBen to take a look at it again :) |
|
@LeBenLeBen could you please take a look and merge if this is fine for you? |
LeBenLeBen
approved these changes
Apr 29, 2020
There was a problem hiding this comment.
All good, it properly highlights Nunjucks syntax and the warning about text reported in #576 is now gone!
|
Thank you @levito 🙇 |
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.
This makes view panels render templates with the following file extensions in Django mode (official replacement mode for Nunjucks): .nunjucks, .nunjs,. .nunj, .njk, .nj, .jinja, .jinja2, .j2
It removes the
langMapfromsrc/core/highlighter.jswhich worked inconsistently and moves the mapping logic tosrc/core/utils.js. This makes it work consistently and prevents warnings when using Nunjucks and running fractal or doing a static export.