feat(rehype): Support default language option #692
Merged
+55
−30
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
✅ Deploy Preview for shiki-matsu ready!
To edit notification comments on pull requests, go to your Netlify site configuration. |
✅ Deploy Preview for shiki-next ready!
To edit notification comments on pull requests, go to your Netlify site configuration. |
|
Could you also help to implement the same interface as in #689? Thanks! |
|
Added |
antfu
reviewed
Jun 7, 2024
antfu
reviewed
Jun 7, 2024
antfu
reviewed
Jun 7, 2024
antfu
approved these changes
Jun 7, 2024
renovate bot
referenced
this pull request
in r4ai/r4ai.dev
Jun 11, 2024
[](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [shiki](https://togithub.com/shikijs/shiki) ([source](https://togithub.com/shikijs/shiki/tree/HEAD/packages/shiki)) | [`1.6.3` -> `1.6.4`](https://renovatebot.com/diffs/npm/shiki/1.6.3/1.6.4) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes <details> <summary>shikijs/shiki (shiki)</summary> ### [`v1.6.4`](https://togithub.com/shikijs/shiki/releases/tag/v1.6.4) [Compare Source](https://togithub.com/shikijs/shiki/compare/v1.6.3...v1.6.4) ##### 🚀 Features - Add CSS variables for markup diff tokens - by [@​SamyPesse](https://togithub.com/SamyPesse) in [https://github.com/shikijs/shiki/issues/698](https://togithub.com/shikijs/shiki/issues/698) [<samp>(84c0b)</samp>](https://togithub.com/shikijs/shiki/commit/84c0b539) - **rehype**: Support default language option - by [@​fuma-nama](https://togithub.com/fuma-nama) and [@​antfu](https://togithub.com/antfu) in [https://github.com/shikijs/shiki/issues/692](https://togithub.com/shikijs/shiki/issues/692) [<samp>(724b4)</samp>](https://togithub.com/shikijs/shiki/commit/724b410e) ##### [View changes on GitHub](https://togithub.com/shikijs/shiki/compare/v1.6.3...v1.6.4) </details> --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Enabled. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/r4ai/r4ai.dev). <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNy4zOTMuMCIsInVwZGF0ZWRJblZlciI6IjM3LjM5My4wIiwidGFyZ2V0QnJhbmNoIjoibWFpbiIsImxhYmVscyI6W119--> Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
](https://renovatebot.com){kind=link}
diegohaz
referenced
this pull request
in ariakit/ariakit
Jun 12, 2024
[](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [shiki](https://togithub.com/shikijs/shiki) ([source](https://togithub.com/shikijs/shiki/tree/HEAD/packages/shiki)) | [`1.6.1` -> `1.6.4`](https://renovatebot.com/diffs/npm/shiki/1.6.1/1.6.4) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes <details> <summary>shikijs/shiki (shiki)</summary> ### [`v1.6.4`](https://togithub.com/shikijs/shiki/releases/tag/v1.6.4) [Compare Source](https://togithub.com/shikijs/shiki/compare/v1.6.3...v1.6.4) ##### 🚀 Features - Add CSS variables for markup diff tokens - by [@​SamyPesse](https://togithub.com/SamyPesse) in [https://github.com/shikijs/shiki/issues/698](https://togithub.com/shikijs/shiki/issues/698) [<samp>(84c0b)</samp>](https://togithub.com/shikijs/shiki/commit/84c0b539) - **rehype**: Support default language option - by [@​fuma-nama](https://togithub.com/fuma-nama) and [@​antfu](https://togithub.com/antfu) in [https://github.com/shikijs/shiki/issues/692](https://togithub.com/shikijs/shiki/issues/692) [<samp>(724b4)</samp>](https://togithub.com/shikijs/shiki/commit/724b410e) ##### [View changes on GitHub](https://togithub.com/shikijs/shiki/compare/v1.6.3...v1.6.4) ### [`v1.6.3`](https://togithub.com/shikijs/shiki/releases/tag/v1.6.3) [Compare Source](https://togithub.com/shikijs/shiki/compare/v1.6.2...v1.6.3) ##### 🚀 Features - **twoslash**: Add line query rendering option for twoslash renderer - by [@​hddhyq](https://togithub.com/hddhyq) and [@​antfu](https://togithub.com/antfu) in [https://github.com/shikijs/shiki/issues/695](https://togithub.com/shikijs/shiki/issues/695) [<samp>(aea25)</samp>](https://togithub.com/shikijs/shiki/commit/aea25115) ##### [View changes on GitHub](https://togithub.com/shikijs/shiki/compare/v1.6.2...v1.6.3) ### [`v1.6.2`](https://togithub.com/shikijs/shiki/releases/tag/v1.6.2) [Compare Source](https://togithub.com/shikijs/shiki/compare/v1.6.1...v1.6.2) ##### 🚀 Features - **markdown-it**: Support default and fallback lang [#​687](https://togithub.com/shikijs/shiki/issues/687) - by [@​Only566](https://togithub.com/Only566) and **winnliu** in [https://github.com/shikijs/shiki/issues/689](https://togithub.com/shikijs/shiki/issues/689) and [https://github.com/shikijs/shiki/issues/687](https://togithub.com/shikijs/shiki/issues/687) [<samp>(3281b)</samp>](https://togithub.com/shikijs/shiki/commit/3281bf5b) ##### [View changes on GitHub](https://togithub.com/shikijs/shiki/compare/v1.6.1...v1.6.2) </details> --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/ariakit/ariakit). <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNy4zNzcuOCIsInVwZGF0ZWRJblZlciI6IjM3LjM5My4wIiwidGFyZ2V0QnJhbmNoIjoibWFpbiIsImxhYmVscyI6W119--> Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
1 task
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.
Description
As the
markdown-itintegration also provides similar options, this PR adds thedefaultLanguageoption to the rehype integration.When no language specified, it uses the default language instead.
Note that it doesn't change the current behaviour. When neither language nor default language is provided, the code block will not be processed by Shiki, hence you can handle it on your own, and won't break existing usages.
Linked Issues
#691
Additional context
unit tests are added.