Mirrors/gitea
0
0
Fork 0
mirror of https://github.com/go-gitea/gitea.git synced 2026-05-21 06:39:48 +02:00
Code Issues Activity

fix(editor): use static import for codemirror language data

Browse Source 
The dynamic `import(...json, {with: {type: 'json'}})` form left a
literal `?import` URL in the entry chunk under rolldown, which the
backend then served with the wrong MIME type. Static import bundles
the data inline correctly.

Co-Authored-By: Claude (Opus 4.7) <noreply@anthropic.com>
This commit is contained in:
silverwind 2026-05-09 06:47:21 +02:00
parent b768078175
commit f905f5e138
No known key found for this signature in database
GPG Key ID: 2E62B41C93869443
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
web_src/js/modules/codeeditor/main.ts
View File

@ -7,6 +7,7 @@ import type {PaletteCommand} from './command-palette.ts';
import {contextMenu, collectSymbols, selectAllOccurrences} from './context-menu.ts'; import {contextMenu, collectSymbols, selectAllOccurrences} from './context-menu.ts';
import {createJsonLinter, createSyntaxErrorLinter} from './linter.ts'; import {createJsonLinter, createSyntaxErrorLinter} from './linter.ts';
import {clickableUrls, goToDefinitionAt, trimTrailingWhitespaceFromView} from './utils.ts'; import {clickableUrls, goToDefinitionAt, trimTrailingWhitespaceFromView} from './utils.ts';
import linguistLanguages from '../../../../assets/codemirror-languages.json' with {type: 'json'};
import type {LanguageDescription, LanguageSupport} from '@codemirror/language'; import type {LanguageDescription, LanguageSupport} from '@codemirror/language';
import type {Compartment, Extension} from '@codemirror/state'; import type {Compartment, Extension} from '@codemirror/state';
import type {EditorView, ViewUpdate} from '@codemirror/view'; import type {EditorView, ViewUpdate} from '@codemirror/view';
@ -43,10 +44,8 @@ export type CodemirrorEditor = {
export type CodemirrorModules = Awaited<ReturnType<typeof importCodemirror>>; export type CodemirrorModules = Awaited<ReturnType<typeof importCodemirror>>;
type LinguistLanguage = {name: string; extensions: string[]; filenames: string[]};
async function importCodemirror() { async function importCodemirror() {
const [autocomplete, commands, language, languageData, lint, search, state, view, highlight, indentMarkers, vscodeKeymap, linguistJson] = await Promise.all([ const [autocomplete, commands, language, languageData, lint, search, state, view, highlight, indentMarkers, vscodeKeymap] = await Promise.all([
import('@codemirror/autocomplete'), import('@codemirror/autocomplete'),
import('@codemirror/commands'), import('@codemirror/commands'),
import('@codemirror/language'), import('@codemirror/language'),
@ -58,9 +57,8 @@ async function importCodemirror() {
import('@lezer/highlight'), import('@lezer/highlight'),
import('@replit/codemirror-indentation-markers'), import('@replit/codemirror-indentation-markers'),
import('@replit/codemirror-vscode-keymap'), import('@replit/codemirror-vscode-keymap'),
import('../../../../assets/codemirror-languages.json', {with: {type: 'json'}}),
]); ]);
return {autocomplete, commands, language, languageData, lint, search, state, view, highlight, indentMarkers, vscodeKeymap, linguistLanguages: linguistJson.default as LinguistLanguage[]}; return {autocomplete, commands, language, languageData, lint, search, state, view, highlight, indentMarkers, vscodeKeymap};
} }
const manualFilenames: Record<string, string[]> = { const manualFilenames: Record<string, string[]> = {
@ -81,7 +79,7 @@ function buildBaseLanguages(cm: CodemirrorModules): LanguageDescription[] {
const loadByName = new Map<string, LanguageDescription['load']>( const loadByName = new Map<string, LanguageDescription['load']>(
cm.languageData.languages.map((l: LanguageDescription) => [l.name, l.load.bind(l)]), cm.languageData.languages.map((l: LanguageDescription) => [l.name, l.load.bind(l)]),
); );
const overrides = cm.linguistLanguages const overrides = linguistLanguages
.filter((l) => loadByName.has(l.name) && !handledByCustomEntry.has(l.name)) .filter((l) => loadByName.has(l.name) && !handledByCustomEntry.has(l.name))
.map((l) => cm.language.LanguageDescription.of({ .map((l) => cm.language.LanguageDescription.of({
name: l.name, name: l.name,
@ -121,8 +119,8 @@ export async function createCodeEditor(textarea: HTMLTextAreaElement, filenameIn
const previewableExts = new Set(config.previewableExtensions || []); const previewableExts = new Set(config.previewableExtensions || []);
const lineWrapExts = config.lineWrapExtensions || []; const lineWrapExts = config.lineWrapExtensions || [];
const cm = await importCodemirror(); const cm = await importCodemirror();
const markdown = cm.linguistLanguages.find((l) => l.name === 'Markdown'); const markdown = linguistLanguages.find((l) => l.name === 'Markdown');
const dockerfile = cm.linguistLanguages.find((l) => l.name === 'Dockerfile'); const dockerfile = linguistLanguages.find((l) => l.name === 'Dockerfile');
const languageDescriptions: LanguageDescription[] = [ const languageDescriptions: LanguageDescription[] = [
...buildBaseLanguages(cm), ...buildBaseLanguages(cm),