update deps

mProjectsCode · mProjectsCode · commit 3cf09c84b9ce · 2024-12-04T13:06:15.000+01:00
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -6,8 +6,8 @@ labels: bug
 assignees: ''
 ---
 
--   [ ] The Plugin is up to date
--   [ ] Obsidian is up to date
+- [ ] The Plugin is up to date
+- [ ] Obsidian is up to date
 
 **Describe the bug**
 A clear and concise description of what the bug is.
@@ -28,11 +28,11 @@ If applicable, add screenshots to help explain your problem.
 
 **Occurs on**
 
--   [ ] Windows
--   [ ] macOS
--   [ ] Linux
--   [ ] Android
--   [ ] iOS
+- [ ] Windows
+- [ ] macOS
+- [ ] Linux
+- [ ] Android
+- [ ] iOS
 
 **Plugin version**
 x.x.x
diff --git a/.prettierrc.json b/.prettierrc.json
@@ -1,12 +1,8 @@
 {
-	"plugins": ["prettier-plugin-svelte"],
-
 	"printWidth": 160,
 	"useTabs": true,
 	"tabWidth": 4,
 	"semi": true,
 	"singleQuote": true,
-	"arrowParens": "avoid",
-
-	"svelteAllowShorthand": false
+	"arrowParens": "avoid"
 }
diff --git a/README.md b/README.md
@@ -119,5 +119,5 @@ This plugin uses [shiki](https://shiki.style/), [Expressive Code](https://expres
 
 Special thanks to:
 
--   Hippo (hippotastic) for their work and support with Expressive Code
--   sailKite for CSS help and testing the plugin
+- Hippo (hippotastic) for their work and support with Expressive Code
+- sailKite for CSS help and testing the plugin
diff --git a/automation/build/esbuild.config.ts b/automation/build/esbuild.config.ts
@@ -1,7 +1,5 @@
 import builtins from 'builtin-modules';
 import esbuild from 'esbuild';
-import esbuildSvelte from 'esbuild-svelte';
-import sveltePreprocess from 'svelte-preprocess';
 import { getBuildBanner } from 'build/buildBanner';
 import { nodeModulesPolyfillPlugin } from 'esbuild-plugins-node-modules-polyfill';
 
@@ -41,14 +39,6 @@ const build = await esbuild.build({
 		MB_GLOBAL_CONFIG_DEV_BUILD: 'false',
 	},
 	plugins: [
-		esbuildSvelte({
-			compilerOptions: { css: 'injected', dev: false, sveltePath: 'svelte' },
-			preprocess: sveltePreprocess(),
-			filterWarnings: warning => {
-				// we don't want warnings from node modules that we can do nothing about
-				return !warning.filename?.includes('node_modules');
-			},
-		}),
 		nodeModulesPolyfillPlugin({
 			modules: {
 				fs: true,
diff --git a/automation/build/esbuild.dev.config.ts b/automation/build/esbuild.dev.config.ts
@@ -1,7 +1,5 @@
 import esbuild from 'esbuild';
 import copy from 'esbuild-plugin-copy-watch';
-import esbuildSvelte from 'esbuild-svelte';
-import sveltePreprocess from 'svelte-preprocess';
 import manifest from '../../manifest.json' assert { type: 'json' };
 import { getBuildBanner } from 'build/buildBanner';
 import { nodeModulesPolyfillPlugin } from 'esbuild-plugins-node-modules-polyfill';
@@ -52,14 +50,6 @@ const context = await esbuild.context({
 				},
 			],
 		}),
-		esbuildSvelte({
-			compilerOptions: { css: 'injected', dev: true, sveltePath: 'svelte' },
-			preprocess: sveltePreprocess(),
-			filterWarnings: warning => {
-				// we don't want warnings from node modules that we can do nothing about
-				return !warning.filename?.includes('node_modules');
-			},
-		}),
 		nodeModulesPolyfillPlugin({
 			modules: {
 				fs: true,
diff --git a/bun.lockb b/bun.lockb
diff --git a/exampleVault/customLanguages/odin.json b/exampleVault/customLanguages/odin.json
@@ -1,7 +1,7 @@
 {
 	"comment": "Taken from https://github.com/DanielGavin/ols. Modification of https://github.com/fivemoreminix/odin-vscode",
 	"$schema": "https://raw.githubusercontent.com/martinring/tmlanguage/master/tmlanguage.json",
-	"name": "Odin",
+	"name": "custom-odin",
 	"patterns": [
 		{ "include": "#file-tags" },
 		{ "include": "#package-name-declaration" },
diff --git a/exampleVault/index.md b/exampleVault/index.md
@@ -104,7 +104,7 @@ Inline code
 
 `{jsx} <button role="button" />`
 
-```Odin
+```custom-odin
 package main
 
 import "core:fmt"
diff --git a/package.json b/package.json
@@ -9,55 +9,49 @@
 		"tsc": "tsc -noEmit -skipLibCheck",
 		"test": "bun test",
 		"test:log": "LOG_TESTS=true bun test",
-		"format": "prettier --write --plugin prettier-plugin-svelte .",
-		"format:check": "prettier --check --plugin prettier-plugin-svelte .",
+		"format": "prettier --write .",
+		"format:check": "prettier --check .",
 		"lint": "eslint --max-warnings=0 src/**",
 		"lint:fix": "eslint --max-warnings=0 --fix src/**",
-		"svelte-check": "svelte-check --compiler-warnings \"unused-export-let:ignore\"",
-		"check": "bun run format:check && bun run tsc && bun run svelte-check && bun run lint && bun run test",
-		"check:fix": "bun run format && bun run tsc && bun run svelte-check && bun run lint:fix && bun run test",
+		"check": "bun run format:check && bun run tsc && bun run lint && bun run test",
+		"check:fix": "bun run format && bun run tsc && bun run lint:fix && bun run test",
 		"release": "bun run automation/release.ts",
 		"stats": "bun run automation/stats.ts"
 	},
 	"keywords": [],
 	"author": "Moritz Jung",
 	"license": "MIT",
 	"devDependencies": {
-		"@codemirror/language": "^6.10.2",
+		"@codemirror/language": "^6.10.6",
 		"@codemirror/state": "^6.4.1",
-		"@codemirror/view": "^6.28.4",
-		"@eslint/js": "^9.6.0",
-		"@expressive-code/core": "^0.35.3",
-		"@expressive-code/plugin-collapsible-sections": "^0.35.3",
-		"@expressive-code/plugin-frames": "^0.35.3",
-		"@expressive-code/plugin-line-numbers": "^0.35.3",
-		"@expressive-code/plugin-shiki": "^0.35.3",
-		"@expressive-code/plugin-text-markers": "^0.35.3",
+		"@codemirror/view": "^6.35.0",
+		"@eslint/js": "^9.16.0",
+		"@expressive-code/core": "^0.38.3",
+		"@expressive-code/plugin-collapsible-sections": "^0.38.3",
+		"@expressive-code/plugin-frames": "^0.38.3",
+		"@expressive-code/plugin-line-numbers": "^0.38.3",
+		"@expressive-code/plugin-shiki": "^0.38.3",
+		"@expressive-code/plugin-text-markers": "^0.38.3",
 		"@happy-dom/global-registrator": "^14.12.3",
 		"@lemons_dev/parsinom": "^0.0.12",
-		"@lezer/common": "^1.2.1",
+		"@lezer/common": "^1.2.3",
 		"@tsconfig/svelte": "^5.0.4",
-		"@types/bun": "^1.1.6",
+		"@types/bun": "^1.1.14",
 		"@types/eslint__js": "^8.42.3",
 		"builtin-modules": "^4.0.0",
-		"esbuild": "^0.23.0",
+		"esbuild": "^0.24.0",
 		"esbuild-plugin-copy-watch": "^2.3.1",
-		"esbuild-plugins-node-modules-polyfill": "^1.6.4",
-		"esbuild-svelte": "^0.8.1",
-		"eslint": "^9.6.0",
+		"esbuild-plugins-node-modules-polyfill": "^1.6.8",
+		"eslint": "^9.16.0",
 		"eslint-plugin-no-relative-import-paths": "^1.5.5",
 		"eslint-plugin-only-warn": "^1.1.0",
 		"itertools-ts": "^1.27.1",
 		"obsidian": "latest",
-		"prettier": "^3.3.2",
-		"prettier-plugin-svelte": "^3.2.5",
-		"shiki": "^1.1.7",
+		"prettier": "^3.4.2",
+		"shiki": "^1.24.0",
 		"string-argv": "^0.3.2",
-		"svelte": "^4.2.18",
-		"svelte-check": "^3.8.4",
-		"svelte-preprocess": "^6.0.2",
-		"tslib": "^2.6.3",
-		"typescript": "^5.5.3",
-		"typescript-eslint": "^7.16.0"
+		"tslib": "^2.8.1",
+		"typescript": "^5.7.2",
+		"typescript-eslint": "^8.17.0"
 	}
 }
diff --git a/src/Highlighter.ts b/src/Highlighter.ts
@@ -199,6 +199,7 @@ export class CodeHighlighter {
 	 */
 	obsidianSafeLanguageNames(): string[] {
 		return this.loadedLanguages.filter(lang => !languageNameBlacklist.has(lang) && !this.plugin.loadedSettings.disabledLanguages.includes(lang));
+		// .concat(this.customLanguages.map(lang => lang.name));
 	}
 
 	/**
diff --git a/src/codemirror/Cm6_ViewPlugin.ts b/src/codemirror/Cm6_ViewPlugin.ts
@@ -125,7 +125,7 @@ export function createCm6Plugin(plugin: ShikiPlugin) {
 						if (props.has('HyperMD-codeblock-begin')) {
 							const content = Cm6_Util.getContent(view.state, node.from, node.to);
 
-							lang = content.match(/^```(\S+)/)?.[1] ?? '';
+							lang = (/^```(\S+)/.exec(content))?.[1] ?? '';
 						}
 
 						if (props.has('HyperMD-codeblock-end')) {
diff --git a/src/main.ts b/src/main.ts
@@ -79,7 +79,9 @@ export default class ShikiPlugin extends Plugin {
 	}
 
 	registerCodeBlockProcessors(): void {
-		for (const language of this.highlighter.obsidianSafeLanguageNames()) {
+		const languages = this.highlighter.obsidianSafeLanguageNames();
+
+		for (const language of languages) {
 			try {
 				this.registerMarkdownCodeBlockProcessor(
 					language,
@@ -107,7 +109,7 @@ export default class ShikiPlugin extends Plugin {
 					1000,
 				);
 			} catch (e) {
-				console.warn(`Failed to register code block processor for ${language}`, e);
+				console.warn(`Failed to register code block processor for ${language}.`, e);
 			}
 		}
 	}
diff --git a/src/themes/ECTheme.ts b/src/themes/ECTheme.ts
@@ -5,17 +5,17 @@ export function getECTheme(settings: Settings): ExpressiveCodeEngineConfig['styl
 	const useThemeColors = settings.preferThemeColors && settings.theme !== 'obsidian-theme';
 
 	const backgroundColor: UnresolvedStyleValue = ({ theme }: { theme: ExpressiveCodeTheme }): StyleValueOrValues =>
-		useThemeColors ? theme.colors['editor.background'] ?? 'var(--shiki-code-background)' : 'var(--shiki-code-background)';
+		useThemeColors ? (theme.colors['editor.background'] ?? 'var(--shiki-code-background)') : 'var(--shiki-code-background)';
 	const foregroundColor: UnresolvedStyleValue = ({ theme }: { theme: ExpressiveCodeTheme }): StyleValueOrValues =>
 		theme.colors['editor.foreground'] ?? 'var(--shiki-code-normal)';
 
 	const gutterBorderColor: UnresolvedStyleValue = ({ theme }: { theme: ExpressiveCodeTheme }): StyleValueOrValues =>
-		useThemeColors ? theme.colors['editorLineNumber.foreground'] ?? 'var(--shiki-gutter-border-color)' : 'var(--shiki-gutter-border-color)';
+		useThemeColors ? (theme.colors['editorLineNumber.foreground'] ?? 'var(--shiki-gutter-border-color)') : 'var(--shiki-gutter-border-color)';
 	const gutterTextColor: UnresolvedStyleValue = ({ theme }: { theme: ExpressiveCodeTheme }): StyleValueOrValues =>
-		useThemeColors ? theme.colors['editorLineNumber.foreground'] ?? 'var(--shiki-gutter-text-color)' : 'var(--shiki-gutter-text-color)';
+		useThemeColors ? (theme.colors['editorLineNumber.foreground'] ?? 'var(--shiki-gutter-text-color)') : 'var(--shiki-gutter-text-color)';
 	const gutterTextActiveColor: UnresolvedStyleValue = ({ theme }: { theme: ExpressiveCodeTheme }): StyleValueOrValues =>
 		useThemeColors
-			? (theme.colors['editorLineNumber.activeForeground'] || theme.colors['editorLineNumber.foreground']) ?? 'var(--shiki-gutter-text-color-highlight)'
+			? ((theme.colors['editorLineNumber.activeForeground'] || theme.colors['editorLineNumber.foreground']) ?? 'var(--shiki-gutter-text-color-highlight)')
 			: 'var(--shiki-gutter-text-color-highlight)';
 
 	return {
diff --git a/src/themes/ThemeMapper.ts b/src/themes/ThemeMapper.ts
@@ -1,5 +1,4 @@
 import { type BundledTheme, bundledThemes, type ThemeRegistration } from 'shiki';
-import type * as hast_util_to_html_lib_types from 'hast-util-to-html/lib';
 import type * as hast_types from 'hast';
 import { OBSIDIAN_THEME } from 'src/themes/ObsidianTheme';
 import type ShikiPlugin from 'src/main';
@@ -71,7 +70,7 @@ export class ThemeMapper {
 	/**
 	 * Maps the placeholder colors in the AST to CSS variables.
 	 */
-	fixAST(ast: hast_util_to_html_lib_types.Parents): hast_util_to_html_lib_types.Parents {
+	fixAST(ast: hast_types.Parents): hast_types.Parents {
 		if (this.plugin.loadedSettings.theme !== 'obsidian-theme') {
 			return ast;
 		}
diff --git a/tests/svelteLoader.ts b/tests/svelteLoader.ts
@@ -1,15 +1,13 @@
 import { plugin } from 'bun';
-import sveltePreprocess from 'svelte-preprocess';
-import esbuildSvelte from 'esbuild-svelte';
 
-plugin(
-	// @ts-ignore
-	esbuildSvelte({
-		compilerOptions: { css: 'injected' },
-		preprocess: sveltePreprocess(),
-		filterWarnings: warning => {
-			// we don't want warnings from node modules that we can do nothing about
-			return !warning.filename?.includes('node_modules');
-		},
-	}),
-);
+// plugin(
+// 	// @ts-ignore
+// 	// esbuildSvelte({
+// 	// 	compilerOptions: { css: 'injected' },
+// 	// 	preprocess: sveltePreprocess(),
+// 	// 	filterWarnings: warning => {
+// 	// 		// we don't want warnings from node modules that we can do nothing about
+// 	// 		return !warning.filename?.includes('node_modules');
+// 	// 	},
+// 	// }),
+// );
diff --git a/tsconfig.json b/tsconfig.json
@@ -12,7 +12,6 @@
 		"importHelpers": true,
 		"isolatedModules": true,
 		"lib": ["DOM", "ESNext"],
-		"types": ["svelte"],
 		"allowSyntheticDefaultImports": true
 	},
 	"include": ["src/**/*.ts", "tests/**/*.ts"]

Original file line number	Diff line number	Diff line change
`@@ -1,12 +1,8 @@`
`1`	`1`	`{`
`2`		`- "plugins": ["prettier-plugin-svelte"],`
`3`		`-`
`4`	`2`	`"printWidth": 160,`
`5`	`3`	`"useTabs": true,`
`6`	`4`	`"tabWidth": 4,`
`7`	`5`	`"semi": true,`
`8`	`6`	`"singleQuote": true,`
`9`		`- "arrowParens": "avoid",`
`10`		`-`
`11`		`- "svelteAllowShorthand": false`
	`7`	`+ "arrowParens": "avoid"`
`12`	`8`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"comment": "Taken from https://github.com/DanielGavin/ols. Modification of https://github.com/fivemoreminix/odin-vscode",`
`3`	`3`	`"$schema": "https://raw.githubusercontent.com/martinring/tmlanguage/master/tmlanguage.json",`
`4`		`- "name": "Odin",`
	`4`	`+ "name": "custom-odin",`
`5`	`5`	`"patterns": [`
`6`	`6`	`{ "include": "#file-tags" },`
`7`	`7`	`{ "include": "#package-name-declaration" },`
Original file line number	Diff line number	Diff line change
`@@ -199,6 +199,7 @@ export class CodeHighlighter {`
`199`	`199`	`*/`
`200`	`200`	`obsidianSafeLanguageNames(): string[] {`
`201`	`201`	`return this.loadedLanguages.filter(lang => !languageNameBlacklist.has(lang) && !this.plugin.loadedSettings.disabledLanguages.includes(lang));`
	`202`	`+ // .concat(this.customLanguages.map(lang => lang.name));`
`202`	`203`	`}`
`203`	`204`
`204`	`205`	`/**`