Skip to content

Next#1597

Merged
Keats merged 32 commits into
masterfrom
next
Dec 5, 2021
Merged

Next#1597
Keats merged 32 commits into
masterfrom
next

Conversation

@Keats
Copy link
Copy Markdown
Collaborator

@Keats Keats commented Aug 24, 2021

No description provided.

Keats and others added 12 commits August 24, 2021 09:14
[bugfix] config.default_language is exposed to templates
…ctory. (#1558)

* Next version

* Added ask prompt for output-dir flag

Added `ask_bool` prompt for `--output-dir` for when the output directory
targeted already exists in the file system.

[Issue: #1378]

* Updated the documentation for #1378

* Added missing "sure" in prompt text

* Added timeout to prompt + dirname

* Fixed complication errors

Co-authored-by: Vincent Prouillet <balthek@gmail.com>
)

* Pass lang to shortcodes context

* Add tests for lang in shortcodes

* Lang is passed to anchor-link.html template

* Document passing lang to shortcodes/anchor-link.html
Add a test to make sure lang can be overriden by passing an explicit argument to the shortcode,
for usage in the markdown filter where the language context is not available.

* Update docs for more information on shortcodes+i18n+markdown() filter

Co-authored-by: southerntofu <southerntofu@thunix.net>
* Support colocating subfolders

* Adjust tests
Related to #419

Gruvbox tmTheme added to test_site, it is taken from
https://github.com/Colorsublime/Colorsublime-Themes (MIT licensed)
@eberkund
Copy link
Copy Markdown

Is there anything blocking this from release? I would absolutely love to be able to use colocated subfolders :)

@Keats
Copy link
Copy Markdown
Collaborator Author

Keats commented Sep 30, 2021

Nothing blocking, just waiting for the release to be a bit more meaty

migueldemoura and others added 5 commits October 2, 2021 11:07
Fixes clippy warnings for the `needless_borrow` lint.
https://rust-lang.github.io/rust-clippy/master/index.html#needless_borrow

Removes the unused `starts_with_schema` function
(dead code since 4086b07).
* Fix get_url resolving asset path to invalid url on Windows

* Make unit test available for all targets
The distroless cc base image includes only what's required to run compiled rust binaries,
see [1] for more info about these images.
Using this base image lets us get rid of dockerize and its build steps and dependencies, including python.
On top of that it provides ca-certificates, timezone data, and other necessary infrastructure.

[1]: https://github.com/GoogleContainerTools/distroless

Fixes #1642
* Add check for export themes

* Remove parens

* Add tests
@eberkund
Copy link
Copy Markdown

Nothing blocking, just waiting for the release to be a bit more meaty

Is it possible to make a release anyways? Colocated subfolders are a very nice feature to have IMO and a release where that is the only addition would be fantastic.

@Keats
Copy link
Copy Markdown
Collaborator Author

Keats commented Nov 17, 2021

I want to get at least #1640 in before releasing. It's getting there (locally), it's probably going to get merged by the end of the week unless some unexpected issues appear.
Once it's merged, there will be a new release soon after.

@eberkund
Copy link
Copy Markdown

I want to get at least #1640 in before releasing. It's getting there (locally), it's probably going to get merged by the end of the week unless some unexpected issues appear. Once it's merged, there will be a new release soon after.

Awesome, looking forward to it!

@scouten
Copy link
Copy Markdown

scouten commented Nov 18, 2021

@eberkund FYI if you are using Netlify to deploy your site and you want to deploy using something that hasn't been released yet, I found myself in a similar situation a few months ago. This might be helpful: https://ericscouten.dev/2021/custom-zola-build/

* Next version

* Added tests for shortcode insertion

* Added TOC tests

* Added test for #1475 and #1355

* Basic internal / external links tests

* Added integration test

* Added pseudocode and started on logos

* Logos parsing for shortcodes

* Fixed string literal parsing

Moved string literal parsing to a new lexer in order to have greater
control of control characters which are parsed. This fixes the bug that
was present in the `string_from_quoted` function and also moves the
`QuoteType` to be in the `ArgValueToken`.

* Moved string literal logic to seperate module

* Added square bracket notation for variables

* Error handling rewritten

Remove the Result from the `fetch_shortcodes` function. Added proper
messages within the internal parsing.

* Reorganized and documented the shortcode submodule

* Added all logic for ShortcodeContext spans

* Added working insertion code for MD files

* Made functions generic over Markdown or HTML

* Add check for embedding bodies

* Structure of main function clear

* Added test for `new_with_transforms` function

* It runs!

* Added the code for handling p-ed html shortcodes

* Removed placeholders in markdown function

* Adjusted integration tests

* fetch_shortcodes now also returns a string

* Start of HTML insertion

* Kinda working everything

* Loading of shortcodes and builtins

* Fix tests

* Some missed fixes

* Tweaks + fmt

* Remove string literal handling

* Fix benches

* Grab shortcode def only once per site

* Fix benches

* Rewrite of parser

* Fix tests

* Add test for #1655

* Re-enable integration test

* Add test for #1601

* Add test for #1600

* Add test for #1500

* Add test for #1320

* Fix test on windows?

Co-authored-by: Gijs Burghoorn <g.burghoorn@gmail.com>
@Keats
Copy link
Copy Markdown
Collaborator Author

Keats commented Nov 19, 2021

Any thoughts on #1640 (comment) and the comment below?

Keats and others added 5 commits November 25, 2021 09:15
* Split checking for theme template off into separate function

Allows to check for fallbacks elsewhere in the code, without attempting to actually render the template.

* Add template fallback checking to taxonomy pages.

* Add template fallback checking to paginated taxonomies

Requires passing additional arguments to Paginator::from_taxonomy, which may not be desirable.

* Update documentation to reflect taxonomy template fallbacks.

* Update generic taxonomy template names.

* Make check_template_fallbacks() return &str.

* Add tests for check_template_fallbacks
@Keats
Copy link
Copy Markdown
Collaborator Author

Keats commented Dec 2, 2021

Ok, just looking to get one fix for #1672 in and then it should get released this weekend.

Can anyone reading this and using shortcodes try this branch? It has been completely rewritten so it would be nice to detect potential issues before releasing.

And for people that cares about colocating sections, also have a look at #1672

@acheronfail
Copy link
Copy Markdown
Contributor

@Keats I've run it on my repository which has ~10 custom shortcodes, and everything seems to be just fine on my end. I can't see anything out of the ordinary, and it all seems to work. 👍

@eberkund
Copy link
Copy Markdown

eberkund commented Dec 3, 2021

@Keats I tried the sub-folder colocation with #1672 and it still works as expected.

@Keats
Copy link
Copy Markdown
Collaborator Author

Keats commented Dec 3, 2021

Great to hear!

@Keats Keats mentioned this pull request Dec 3, 2021
@Keats Keats merged commit a8a236f into master Dec 5, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.