From 8bc38dd939e1674ca0e7551ae17c47efbf85b2db Mon Sep 17 00:00:00 2001 From: SheetJS Date: Mon, 16 Jan 2023 15:16:50 -0500 Subject: [PATCH 1/3] fix(shiki): JSON import type assertion --- src/runtime/transformers/shiki/highlighter.ts | 2 +- .../{mdc.tmLanguage.json => mdc.tmLanguage.ts} | 11 ++++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) rename src/runtime/transformers/shiki/languages/{mdc.tmLanguage.json => mdc.tmLanguage.ts} (99%) diff --git a/src/runtime/transformers/shiki/highlighter.ts b/src/runtime/transformers/shiki/highlighter.ts index c0822a126..2ee8001f2 100644 --- a/src/runtime/transformers/shiki/highlighter.ts +++ b/src/runtime/transformers/shiki/highlighter.ts @@ -2,7 +2,7 @@ import { getHighlighter, BUNDLED_LANGUAGES, BUNDLED_THEMES, Lang, Theme as Shiki import consola from 'consola' import type { ModuleOptions } from '../../../module' import { createSingleton } from '../utils' -import mdcTMLanguage from './languages/mdc.tmLanguage.json' +import mdcTMLanguage from './languages/mdc.tmLanguage' import type { MarkdownNode, HighlighterOptions, Theme, HighlightThemedToken, HighlightThemedTokenLine, TokenColorMap } from './types' // Re-create logger locally as utils cannot be imported from here diff --git a/src/runtime/transformers/shiki/languages/mdc.tmLanguage.json b/src/runtime/transformers/shiki/languages/mdc.tmLanguage.ts similarity index 99% rename from src/runtime/transformers/shiki/languages/mdc.tmLanguage.json rename to src/runtime/transformers/shiki/languages/mdc.tmLanguage.ts index 51425aecd..829664477 100644 --- a/src/runtime/transformers/shiki/languages/mdc.tmLanguage.json +++ b/src/runtime/transformers/shiki/languages/mdc.tmLanguage.ts @@ -1,4 +1,7 @@ -{ +// see microsoft/vscode-textmate#185 +// import { IRawGrammar } from 'vscode-textmate/release/rawGrammar'; + +const grammar /*: IRawGrammar */ = { "information_for_contributors": [ "This file has been converted from https://github.com/docusgen/vscode-extension/blob/main/syntaxes/mdc.tmLanguage.json", "If you want to provide a fix or improvement, please create a pull request against the original repository.", @@ -64,7 +67,7 @@ "include": "#markdown_attributes" } ] - }, + }, "markdown_attributes": { "match": "(?x)([^ ])( # attributes\n ({)\n ([^{]*)\n (})\n )", "name": "markup.component.attribute", @@ -570,4 +573,6 @@ "while": "(^|\\G)\\s*(>) ?" } } -} \ No newline at end of file +} + +export default grammar; \ No newline at end of file From 0c828dccbcd760fe1d08acc3d52ec5d1713e4e3c Mon Sep 17 00:00:00 2001 From: Farnabaz Date: Thu, 19 Jan 2023 15:02:44 +0100 Subject: [PATCH 2/3] Update src/runtime/transformers/shiki/languages/mdc.tmLanguage.ts --- src/runtime/transformers/shiki/languages/mdc.tmLanguage.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/runtime/transformers/shiki/languages/mdc.tmLanguage.ts b/src/runtime/transformers/shiki/languages/mdc.tmLanguage.ts index 829664477..ed4790bd6 100644 --- a/src/runtime/transformers/shiki/languages/mdc.tmLanguage.ts +++ b/src/runtime/transformers/shiki/languages/mdc.tmLanguage.ts @@ -1,3 +1,4 @@ +// @ts-nocheck // see microsoft/vscode-textmate#185 // import { IRawGrammar } from 'vscode-textmate/release/rawGrammar'; From 4e6292d7465d344ab7192058762600584aade157 Mon Sep 17 00:00:00 2001 From: Farnabaz Date: Thu, 19 Jan 2023 15:14:42 +0100 Subject: [PATCH 3/3] Update src/runtime/transformers/shiki/languages/mdc.tmLanguage.ts --- src/runtime/transformers/shiki/languages/mdc.tmLanguage.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/runtime/transformers/shiki/languages/mdc.tmLanguage.ts b/src/runtime/transformers/shiki/languages/mdc.tmLanguage.ts index ed4790bd6..0d304b8c4 100644 --- a/src/runtime/transformers/shiki/languages/mdc.tmLanguage.ts +++ b/src/runtime/transformers/shiki/languages/mdc.tmLanguage.ts @@ -1,4 +1,4 @@ -// @ts-nocheck +/* eslint-disable */ // see microsoft/vscode-textmate#185 // import { IRawGrammar } from 'vscode-textmate/release/rawGrammar';