Skip to content

feat(shiki): add support for all languages on the server #9102

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

Open
avivkeller wants to merge 2 commits into
base: main
Choose a base branch
from
+16 −33
Open

feat(shiki): add support for all languages on the server #9102

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
564cfc7
feat(shiki): add support for all languages on the server
avivkeller Aug 13, 2026
724bd4c
Create shiki-more-more.md
avivkeller Aug 13, 2026
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
5 changes: 5 additions & 0 deletions .changeset/shiki-more-more.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@node-core/rehype-shiki': minor
---

Add support for all Shiki languages when the `minimal` preset is not selected.
44 changes: 11 additions & 33 deletions packages/rehype-shiki/src/index.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,4 @@
// Keep all imports at the top
import cLanguage from 'shiki/langs/c.mjs';
import coffeeScriptLanguage from 'shiki/langs/coffeescript.mjs';
import cPlusPlusLanguage from 'shiki/langs/cpp.mjs';
import diffLanguage from 'shiki/langs/diff.mjs';
import dockerLanguage from 'shiki/langs/docker.mjs';
import httpLanguage from 'shiki/langs/http.mjs';
import iniLanguage from 'shiki/langs/ini.mjs';
import javaScriptLanguage from 'shiki/langs/javascript.mjs';
import jsonLanguage from 'shiki/langs/json.mjs';
import powershellLanguage from 'shiki/langs/powershell.mjs';
import shellScriptLanguage from 'shiki/langs/shellscript.mjs';
import shellSessionLanguage from 'shiki/langs/shellsession.mjs';
import typeScriptLanguage from 'shiki/langs/typescript.mjs';
import yamlLanguage from 'shiki/langs/yaml.mjs';
import { bundledLanguagesInfo } from 'shiki/langs';

import createHighlighter, { getLanguageByName } from '#rs/highlighter.mjs';

Expand All @@ -37,7 +23,10 @@ async function getEngine({ wasm = false }) {

const { createJavaScriptRegexEngine } =
await import('@shikijs/engine-javascript');
return createJavaScriptRegexEngine();

// Not every bundled grammar compiles under the JavaScript engine,
// so skip the patterns it cannot handle instead of throwing.
return createJavaScriptRegexEngine({ forgiving: true });
}

/**
Expand All @@ -55,24 +44,13 @@ async function getTransformers({ twoslash = false, twoslashOptions }) {
return transformers;
}

// Every language, since this is meant for SSR-ed highlighting :-)
export const LANGS = [
...cLanguage,
...coffeeScriptLanguage,
...cPlusPlusLanguage,
...diffLanguage,
...dockerLanguage,
...httpLanguage,
...iniLanguage,
{
...javaScriptLanguage[0],
aliases: javaScriptLanguage[0].aliases.concat('cjs', 'mjs'),
},
...jsonLanguage,
...powershellLanguage,
...shellScriptLanguage,
...shellSessionLanguage,
...typeScriptLanguage,
...yamlLanguage,
...new Set(
(
await Promise.all(bundledLanguagesInfo.map(language => language.import()))
).flatMap(language => language.default)
),
];

export const getLanguageDisplayName = language =>
Expand Down
Loading