fix(build): bound runtime updater UI memory #1663
There are no files selected for viewing
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| import { createHighlighterCore } from 'shiki/core'; | ||
| import { createOnigurumaEngine } from 'shiki/engine/oniguruma'; | ||
| import githubDark from 'shiki/themes/github-dark.mjs'; | ||
| import githubLight from 'shiki/themes/github-light.mjs'; | ||
| import { loadShikiLanguageRegistrations } from './shikiLanguages.js'; | ||
|
|
||
| // The root `shiki` entry constructs its full bundle and therefore exposes a | ||
| // dynamic import edge for every bundled language and theme to Vite. Core plus | ||
| // the explicit registry keeps this lazy chunk limited to CodeBlock languages. | ||
| export async function createHighlighter() { | ||
| return createHighlighterCore({ | ||
| engine: createOnigurumaEngine(import('shiki/wasm')), | ||
| themes: [githubDark, githubLight], | ||
| langs: await loadShikiLanguageRegistrations(), | ||
| }); | ||
| } |
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,88 @@ | ||
| import type { LanguageRegistration } from 'shiki/core'; | ||
|
|
||
| type ShikiLanguageModule = { default: LanguageRegistration[] }; | ||
|
|
||
| type ShikiLanguageDefinition = { | ||
| aliases: Readonly<Record<string, string>>; | ||
| load: () => Promise<ShikiLanguageModule>; | ||
| }; | ||
|
|
||
| function defineShikiLanguageRegistry< | ||
| const Registry extends readonly ShikiLanguageDefinition[], | ||
| >(registry: Registry): Registry { | ||
| return registry; | ||
| } | ||
|
|
||
| /** | ||
| * The single source of truth for every fenced-code label accepted by | ||
| * CodeBlock, its normalized Shiki language, and the grammar loaded for it. | ||
| * Explicit dynamic imports retain the lazy highlighter boundary without | ||
| * pulling Shiki's full language registry into the Vite build graph. | ||
| */ | ||
| export const SHIKI_LANGUAGE_REGISTRY = defineShikiLanguageRegistry([ | ||
| { | ||
| aliases: { sh: 'sh', shell: 'sh', zsh: 'sh', bash: 'bash' }, | ||
| load: () => import('shiki/langs/bash.mjs'), | ||
| }, | ||
| { aliases: { css: 'css' }, load: () => import('shiki/langs/css.mjs') }, | ||
| { aliases: { diff: 'diff', patch: 'diff' }, load: () => import('shiki/langs/diff.mjs') }, | ||
| { | ||
| aliases: { dockerfile: 'dockerfile', docker: 'dockerfile' }, | ||
| load: () => import('shiki/langs/dockerfile.mjs'), | ||
| }, | ||
| { aliases: { go: 'go', golang: 'go' }, load: () => import('shiki/langs/go.mjs') }, | ||
| { aliases: { html: 'html' }, load: () => import('shiki/langs/html.mjs') }, | ||
| { aliases: { js: 'js', javascript: 'js' }, load: () => import('shiki/langs/javascript.mjs') }, | ||
| { aliases: { json: 'json' }, load: () => import('shiki/langs/json.mjs') }, | ||
| { aliases: { jsx: 'jsx' }, load: () => import('shiki/langs/jsx.mjs') }, | ||
| { aliases: { md: 'md', markdown: 'md' }, load: () => import('shiki/langs/markdown.mjs') }, | ||
| { aliases: { py: 'py', python: 'py' }, load: () => import('shiki/langs/python.mjs') }, | ||
| { aliases: { rust: 'rust', rs: 'rust' }, load: () => import('shiki/langs/rust.mjs') }, | ||
| { | ||
| aliases: { solidity: 'solidity', sol: 'solidity' }, | ||
| load: () => import('shiki/langs/solidity.mjs'), | ||
| }, | ||
| { aliases: { sparql: 'sparql' }, load: () => import('shiki/langs/sparql.mjs') }, | ||
| { aliases: { sql: 'sql' }, load: () => import('shiki/langs/sql.mjs') }, | ||
| { aliases: { toml: 'toml' }, load: () => import('shiki/langs/toml.mjs') }, | ||
| { aliases: { tsx: 'tsx' }, load: () => import('shiki/langs/tsx.mjs') }, | ||
| { aliases: { ts: 'ts', typescript: 'ts' }, load: () => import('shiki/langs/typescript.mjs') }, | ||
| { aliases: { xml: 'xml' }, load: () => import('shiki/langs/xml.mjs') }, | ||
| { aliases: { yaml: 'yaml', yml: 'yaml' }, load: () => import('shiki/langs/yaml.mjs') }, | ||
| ] as const); | ||
|
|
||
| type UnionToIntersection<Union> = ( | ||
| Union extends unknown ? (value: Union) => void : never | ||
| ) extends (value: infer Intersection) => void ? Intersection : never; | ||
|
|
||
| type ShikiLanguageAliases = UnionToIntersection< | ||
| typeof SHIKI_LANGUAGE_REGISTRY[number]['aliases'] | ||
| >; | ||
|
|
||
| export const SHIKI_LANGUAGE_ALIASES = Object.freeze(Object.assign( | ||
| {}, | ||
| ...SHIKI_LANGUAGE_REGISTRY.map(({ aliases }) => aliases), | ||
| )) as Readonly<ShikiLanguageAliases>; | ||
|
|
||
| export type ShikiLanguageAlias = keyof ShikiLanguageAliases; | ||
| export type SupportedShikiLanguage = ShikiLanguageAliases[ShikiLanguageAlias]; | ||
|
|
||
| export const SUPPORTED_SHIKI_LANGUAGE_ALIASES = Object.freeze( | ||
| Object.keys(SHIKI_LANGUAGE_ALIASES) as ShikiLanguageAlias[], | ||
| ); | ||
|
|
||
| export function normalizeShikiLanguage(raw: string | undefined): SupportedShikiLanguage | null { | ||
| if (!raw) return null; | ||
| const label = raw.toLowerCase().trim() as ShikiLanguageAlias; | ||
| return SHIKI_LANGUAGE_ALIASES[label] ?? null; | ||
| } | ||
|
|
||
| export async function loadShikiLanguageRegistrations(): Promise<LanguageRegistration[]> { | ||
| const registrations = (await Promise.all( | ||
| SHIKI_LANGUAGE_REGISTRY.map(({ load }) => load()), | ||
| )).flatMap(({ default: grammar }) => grammar); | ||
|
|
||
| return registrations.filter((grammar, index, all) => | ||
| all.findIndex((candidate) => candidate.name === grammar.name) === index, | ||
| ); | ||
| } |
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,29 @@ | ||
| import { describe, expect, it } from 'vitest'; | ||
| import { createHighlighter } from '../src/ui/components/chat/shikiHighlighter.js'; | ||
| import { | ||
| normalizeShikiLanguage, | ||
| SUPPORTED_SHIKI_LANGUAGE_ALIASES, | ||
| } from '../src/ui/components/chat/shikiLanguages.js'; | ||
|
|
||
| describe('fine-grained Shiki highlighter', () => { | ||
| it('loads every CodeBlock language alias and both UI themes', async () => { | ||
| const highlighter = await createHighlighter(); | ||
| try { | ||
| for (const alias of SUPPORTED_SHIKI_LANGUAGE_ALIASES) { | ||
| const lang = normalizeShikiLanguage(alias); | ||
| expect(lang, alias).not.toBeNull(); | ||
| expect(() => highlighter.codeToHtml('const value = 1;', { | ||
| lang: lang!, | ||
| theme: 'github-dark', | ||
| }), alias).not.toThrow(); | ||
| } | ||
|
|
||
| expect(highlighter.codeToHtml('const value = 1;', { | ||
| lang: 'ts', | ||
| theme: 'github-light', | ||
| })).toContain('github-light'); | ||
| } finally { | ||
| highlighter.dispose(); | ||
| } | ||
| }); | ||
| }); |
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,34 @@ | ||
| #!/usr/bin/env node | ||
| import { spawnSync } from 'node:child_process'; | ||
| import { pathToFileURL } from 'node:url'; | ||
| import { runtimeBuildPnpmArgs } from './lib/runtime-build-plan.mjs'; | ||
|
|
||
| export function runRuntimePackageBuild({ | ||
| extraArgs = process.argv.slice(2), | ||
| spawn = spawnSync, | ||
| platform = process.platform, | ||
| reportError = (message) => console.error(message), | ||
| } = {}) { | ||
| const args = runtimeBuildPnpmArgs(['run', 'build', ...extraArgs]); | ||
| const result = spawn('pnpm', args, { | ||
| stdio: 'inherit', | ||
| shell: platform === 'win32', | ||
| }); | ||
|
|
||
| if (result.error) { | ||
| reportError(result.error.message); | ||
| return 1; | ||
| } | ||
| if (typeof result.status === 'number') return result.status; | ||
| if (result.signal) { | ||
| reportError(`pnpm ${args.join(' ')} exited via ${result.signal}`); | ||
| return 1; | ||
| } | ||
| reportError(`pnpm ${args.join(' ')} exited without a status`); | ||
| return 1; | ||
| } | ||
|
|
||
| const isMain = process.argv[1] && import.meta.url === pathToFileURL(process.argv[1]).href; | ||
| if (isMain) { | ||
| process.exitCode = runRuntimePackageBuild(); | ||
| } |
Oops, something went wrong.
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.