Port upstream Prism dependency order fix#69
Open
Renakoni wants to merge 1 commit into
Open
Conversation
This was referenced Jul 8, 2026
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
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.
Upstream
Ports marktext/marktext#4861: marktext/marktext#4861
Upstream fixed Muya's Prism language loader so dependency languages are loaded in the order Prism expects. The concrete failure is cold-loading C++ before C:
prism-cppextends thecgrammar, so a parallel/racy load can fail before the dependency exists.Android relevance
Android uses this Muya Prism path for editor code highlighting in the WebView. The same dependency-order race applies here on cold grammar loads, especially C/C++ and other grammars with Prism dependencies.
Changes
loadComponentcallback.seriesandparallelchainers so dependent components are awaited before dependents run.loaded,cached, andnoexistoutcomes.cpp, assertscis registered beforecpp, and verifies tokenization does not throw.../../../node_modules/prismjs/components/prism-*.js. The previous glob made the focused Vitest run unable to resolve several Prism modules such asc,latex, andyaml; this path keeps the dynamic import map tied to the actual dependency under this workspace.Verification
pnpm --dir third_party/muya exec vitest run src/utils/prism/__tests__/loadLanguageDependencyOrder.spec.tspnpm build