Tools/Notes
1
0
Fork 0
mirror of https://github.com/TriliumNext/Notes.git synced 2025-07-27 18:12:29 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'jshprentz/develop' into develop

Browse Source
This commit is contained in:
Elian Doran 2025-06-16 17:51:22 +03:00
commit 26ad428b24
No known key found for this signature in database
3 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
packages/codemirror/package.json
View File

@ -59,6 +59,7 @@
"@replit/codemirror-vim": "6.3.0", "@replit/codemirror-vim": "6.3.0",
"@ssddanbrown/codemirror-lang-smarty": "1.0.0", "@ssddanbrown/codemirror-lang-smarty": "1.0.0",
"@ssddanbrown/codemirror-lang-twig": "1.0.0", "@ssddanbrown/codemirror-lang-twig": "1.0.0",
"codemirror-lang-elixir": "4.0.0",
"codemirror-lang-hcl": "0.1.0", "codemirror-lang-hcl": "0.1.0",
"codemirror-lang-mermaid": "0.5.0", "codemirror-lang-mermaid": "0.5.0",
"eslint-linter-browserify": "9.29.0" "eslint-linter-browserify": "9.29.0"

1
packages/codemirror/src/syntax_highlighting.ts
View File

@ -84,6 +84,7 @@ const byMimeType: Record<string, (() => Promise<StreamParser<unknown> | Language
"text/x-ebnf": async () => (await import('@codemirror/legacy-modes/mode/ebnf')).ebnf, "text/x-ebnf": async () => (await import('@codemirror/legacy-modes/mode/ebnf')).ebnf,
"text/x-ecl": async () => (await import('@codemirror/legacy-modes/mode/ecl')).ecl, "text/x-ecl": async () => (await import('@codemirror/legacy-modes/mode/ecl')).ecl,
"text/x-eiffel": async () => (await import('@codemirror/legacy-modes/mode/eiffel')).eiffel, "text/x-eiffel": async () => (await import('@codemirror/legacy-modes/mode/eiffel')).eiffel,
"text/x-elixir": async () => (await import('codemirror-lang-elixir')).elixir(),
"text/x-elm": async () => (await import('@codemirror/legacy-modes/mode/elm')).elm, "text/x-elm": async () => (await import('@codemirror/legacy-modes/mode/elm')).elm,
"text/x-erlang": async () => (await import('@codemirror/legacy-modes/mode/erlang')).erlang, "text/x-erlang": async () => (await import('@codemirror/legacy-modes/mode/erlang')).erlang,
"text/x-esper": async () => (await import('@codemirror/legacy-modes/mode/sql')).esper, "text/x-esper": async () => (await import('@codemirror/legacy-modes/mode/sql')).esper,

19
pnpm-lock.yaml generated
View File

@ -1289,6 +1289,9 @@ importers:
'@ssddanbrown/codemirror-lang-twig': '@ssddanbrown/codemirror-lang-twig':
specifier: 1.0.0 specifier: 1.0.0
version: 1.0.0 version: 1.0.0
codemirror-lang-elixir:
specifier: 4.0.0
version: 4.0.0
codemirror-lang-hcl: codemirror-lang-hcl:
specifier: 0.1.0 specifier: 0.1.0
version: 0.1.0 version: 0.1.0
@ -6186,6 +6189,9 @@ packages:
resolution: {integrity: sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ==} resolution: {integrity: sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ==}
engines: {iojs: '>= 1.0.0', node: '>= 0.12.0'} engines: {iojs: '>= 1.0.0', node: '>= 0.12.0'}
codemirror-lang-elixir@4.0.0:
resolution: {integrity: sha512-mzFesxo/t6KOxwnkqVd34R/q7yk+sMtHh6vUKGAvjwHmpL7bERHB+vQAsmU/nqrndkwVeJEHWGw/z/ybfdiudA==}
codemirror-lang-hcl@0.1.0: codemirror-lang-hcl@0.1.0:
resolution: {integrity: sha512-duwKEaQDhkJWad4YQ9pv4282BS6hCdR+gS/qTAj3f9bypXNNZ42bIN43h9WK3DjyZRENtVlUQdrQM1sA44wHmA==} resolution: {integrity: sha512-duwKEaQDhkJWad4YQ9pv4282BS6hCdR+gS/qTAj3f9bypXNNZ42bIN43h9WK3DjyZRENtVlUQdrQM1sA44wHmA==}
@ -9167,6 +9173,9 @@ packages:
resolution: {integrity: sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==} resolution: {integrity: sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==}
engines: {node: '>= 0.8.0'} engines: {node: '>= 0.8.0'}
lezer-elixir@1.1.2:
resolution: {integrity: sha512-K3yPMJcNhqCL6ugr5NkgOC1g37rcOM38XZezO9lBXy0LwWFd8zdWXfmRbY829vZVk0OGCQoI02yDWp9FF2OWZA==}
lie@3.3.0: lie@3.3.0:
resolution: {integrity: sha512-UaiMJzeWRlEujzAuw5LokY1L5ecNQYZKfmyZ9L7wDHb/p5etKaxXhohBcrw0EYby+G/NA52vRSN4N39dxHAIwQ==} resolution: {integrity: sha512-UaiMJzeWRlEujzAuw5LokY1L5ecNQYZKfmyZ9L7wDHb/p5etKaxXhohBcrw0EYby+G/NA52vRSN4N39dxHAIwQ==}
@ -20215,6 +20224,11 @@ snapshots:
co@4.6.0: {} co@4.6.0: {}
codemirror-lang-elixir@4.0.0:
dependencies:
'@codemirror/language': 6.11.0
lezer-elixir: 1.1.2
codemirror-lang-hcl@0.1.0: codemirror-lang-hcl@0.1.0:
dependencies: dependencies:
'@codemirror/language': 6.11.0 '@codemirror/language': 6.11.0
@ -23865,6 +23879,11 @@ snapshots:
prelude-ls: 1.2.1 prelude-ls: 1.2.1
type-check: 0.4.0 type-check: 0.4.0
lezer-elixir@1.1.2:
dependencies:
'@lezer/highlight': 1.2.1
'@lezer/lr': 1.4.2
lie@3.3.0: lie@3.3.0:
dependencies: dependencies:
immediate: 3.0.6 immediate: 3.0.6