Skip to content
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

Jump to bottom

single shiki instance & on the server w/ dev #906

Merged
merged 2 commits into from
Jul 29, 2024
Merged

single shiki instance & on the server w/ dev #906

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
77f7354
single shiki instance & on the server w/ dev
thejackshelton Jul 26, 2024
8d5eed4
fix(copy-css-config): add track code to generate shiki on click
maiieul Jul 29, 2024
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
54 changes: 15 additions & 39 deletions apps/website/src/components/highlight/highlight.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,25 +1,23 @@
import {
ClassList,
PropsOf,
component$,
useSignal,
useTask$,
useVisibleTask$,
$,
} from '@builder.io/qwik';
import { ClassList, PropsOf, component$, useSignal, useTask$ } from '@builder.io/qwik';
import { CodeCopy } from '../code-copy/code-copy';
import { cn } from '@qwik-ui/utils';
import { isDev } from '@builder.io/qwik/build';
import poimandres from 'shiki/themes/poimandres.mjs';
import html from 'shiki/langs/html.mjs';
import css from 'shiki/langs/css.mjs';
import tsx from 'shiki/langs/tsx.mjs';
import { createHighlighterCore } from 'shiki/index.mjs';
import { createHighlighterCore, BundledLanguage } from 'shiki/index.mjs';

// Create a single highlighter instance
const highlighterPromise = createHighlighterCore({
themes: [poimandres],
langs: [html, css, tsx],
loadWasm: import('shiki/wasm'),
});

export type HighlightProps = PropsOf<'div'> & {
code: string;
copyCodeClass?: ClassList;
language?: 'tsx' | 'html' | 'css';
language?: BundledLanguage;
splitCommentStart?: string;
splitCommentEnd?: string;
};
Expand All @@ -35,7 +33,8 @@ export const Highlight = component$(
}: HighlightProps) => {
const codeSig = useSignal('');

const addShiki$ = $(async () => {
useTask$(async ({ track }) => {
track(() => code);
let modifiedCode: string = code;

let partsOfCode = modifiedCode.split(splitCommentStart);
Expand All @@ -48,35 +47,12 @@ export const Highlight = component$(
modifiedCode = partsOfCode[0];
}

const highlighter = await createHighlighterCore({
themes: [poimandres],
langs: [html, css, tsx],
loadWasm: import('shiki/wasm'),
});

const highlighter = await highlighterPromise;
const str = highlighter.codeToHtml(modifiedCode, {
lang: language,
themes: {
light: 'poimandres',
dark: 'poimandres',
},
theme: 'poimandres',
});
codeSig.value = str.toString();
});

useTask$(async ({ track }) => {
track(() => code);
if (!isDev) {
await addShiki$();
}
});

// eslint-disable-next-line qwik/no-use-visible-task
useVisibleTask$(async ({ track }) => {
track(() => code);
if (isDev) {
await addShiki$();
}
codeSig.value = str;
});

return (
Expand Down
Loading