self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2025-11-23 22:36:32 +02:00
Code Issues Releases Activity

Desktop: Fixes #9752: CodeMirror 6 plugin API: Allow importing @codemirror/lang-markdown and @lezer/highlight (#9753)

Browse Source
This commit is contained in:
Henry Heino
2024-01-22 07:28:00 -08:00
committed by GitHub
parent f3518cddbe
commit 6720fd1f0e
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
packages/editor/CodeMirror/pluginApi/codeMirrorRequire.ts
View File

@@ -5,11 +5,14 @@ import * as codeMirrorLanguage from '@codemirror/language';
import * as codeMirrorAutocomplete from '@codemirror/autocomplete'; import * as codeMirrorAutocomplete from '@codemirror/autocomplete';
import * as codeMirrorCommands from '@codemirror/commands'; import * as codeMirrorCommands from '@codemirror/commands';
import * as codeMirrorLint from '@codemirror/lint'; import * as codeMirrorLint from '@codemirror/lint';
import * as codeMirrorLangHtml from '@codemirror/lang-html';
import * as codeMirrorLangMarkdown from '@codemirror/lang-markdown';
import * as codeMirrorLanguageData from '@codemirror/language-data';
import * as lezerHighlight from '@lezer/highlight'; import * as lezerHighlight from '@lezer/highlight';
import * as lezerCommon from '@lezer/common'; import * as lezerCommon from '@lezer/common';
import * as lezerMarkdown from '@lezer/markdown'; import * as lezerMarkdown from '@lezer/markdown';
import * as codeMirrorLangHtml from '@codemirror/lang-html';
import * as codeMirrorLanguageData from '@codemirror/language-data';
// Exposes CodeMirror libraries to plugins. // Exposes CodeMirror libraries to plugins.
// //
@@ -21,12 +24,14 @@ const libraryNameToPackage: Record<string, any> = {
'@codemirror/language': codeMirrorLanguage, '@codemirror/language': codeMirrorLanguage,
'@codemirror/autocomplete': codeMirrorAutocomplete, '@codemirror/autocomplete': codeMirrorAutocomplete,
'@codemirror/commands': codeMirrorCommands, '@codemirror/commands': codeMirrorCommands,
'@codemirror/highlight': lezerHighlight,
'@codemirror/lint': codeMirrorLint, '@codemirror/lint': codeMirrorLint,
'@codemirror/lang-html': codeMirrorLangHtml, '@codemirror/lang-html': codeMirrorLangHtml,
'@codemirror/lang-markdown': codeMirrorLangMarkdown,
'@codemirror/language-data': codeMirrorLanguageData, '@codemirror/language-data': codeMirrorLanguageData,
'@lezer/common': lezerCommon, '@lezer/common': lezerCommon,
'@lezer/markdown': lezerMarkdown, '@lezer/markdown': lezerMarkdown,
'@lezer/highlight': lezerHighlight,
}; };
const codeMirrorRequire = (library: string) => { const codeMirrorRequire = (library: string) => {

2
packages/generator-joplin/generators/app/templates/webpack.config.js
View File

@@ -227,9 +227,11 @@ const externalContentScriptLibraries = [
'@codemirror/highlight', '@codemirror/highlight',
'@codemirror/lint', '@codemirror/lint',
'@codemirror/lang-html', '@codemirror/lang-html',
'@codemirror/lang-markdown',
'@codemirror/language-data', '@codemirror/language-data',
'@lezer/common', '@lezer/common',
'@lezer/markdown', '@lezer/markdown',
'@lezer/highlight',
]; ];
const extraScriptExternals = {}; const extraScriptExternals = {};