feat(ui): ✨ merge editor (#79)

add simple merge editor to resolve conflicts between files.

.gitignore

@@ -34,3 +34,6 @@ styles.js
 
 # Outdir from esbuild
 build
+# For Monaco Editor (generated by esbuild)
+codicon-LCPAQIGT.ttf
+main.css

esbuild.config.mjs

@@ -4,6 +4,8 @@ import builtins from "builtin-modules";
 import fs from "fs";
 import sass from "sass";
 import minify from "css-minify";
+import esbuildSvelte from "esbuild-svelte";
+import sveltePreprocess from "svelte-preprocess";
 
 const banner = `/*
 THIS IS A GENERATED/BUNDLED FILE BY ESBUILD
@@ -425,13 +427,20 @@ const context = await esbuild.context({
 	minify: prod,
 	treeShaking: true,
 	outdir: outdir,
-	plugins: [copyManifest, copyMinifiedCSS],
-	loader: { ".scss": "text" },
+	plugins: [
+		copyManifest,
+		copyMinifiedCSS,
+		esbuildSvelte({
+			compilerOptions: { css: true },
+			preprocess: sveltePreprocess(),
+		}),
+	],
+	loader: { ".scss": "text", ".ttf": "text" },
 });
 
 if (prod) {
-	await context.rebuild();
+	await context.rebuild().catch(() => process.exit(1));
 	process.exit(0);
 } else {
-	await context.watch();
+	await context.watch().catch(() => process.exit(1));
 }

package.json

@@ -16,31 +16,41 @@
 	"author": "LBF38",
 	"license": "MIT",
 	"devDependencies": {
+		"@codemirror/merge": "^6.1.1",
 		"@codemirror/state": "^6.2.1",
 		"@codemirror/view": "^6.13.0",
 		"@commitlint/config-conventional": "^17.6.5",
 		"@js-random/date": "^0.3.5",
 		"@semantic-release/changelog": "^6.0.3",
 		"@semantic-release/exec": "^6.0.3",
 		"@semantic-release/git": "^10.0.1",
+		"@tsconfig/svelte": "^5.0.0",
 		"@types/diff": "^5.0.3",
+		"@types/marked": "^5.0.1",
 		"@types/node": "^18.0.0",
 		"@typescript-eslint/eslint-plugin": "5.61.0",
 		"@typescript-eslint/parser": "5.61.0",
 		"builtin-modules": "3.3.0",
 		"child_process": "^1.0.2",
+		"codemirror": "^6.0.1",
 		"css-minify": "^2.0.0",
 		"diff": "^5.1.0",
 		"diff2html": "^3.4.35",
 		"esbuild": "0.18.11",
+		"esbuild-svelte": "^0.7.4",
 		"eslint": "^8.42.0",
 		"fs": "0.0.1-security",
 		"highlight.js": "^11.8.0",
 		"husky": "^8.0.0",
 		"lorem-ipsum": "^2.0.8",
+		"marked": "^5.1.1",
+		"monaco-editor": "0.40.0",
 		"obsidian": "latest",
 		"sass": "^1.62.1",
 		"semantic-release": "^21.0.5",
+		"style-mod": "^4.0.3",
+		"svelte": "^4.1.1",
+		"svelte-preprocess": "^5.0.4",
 		"tslib": "2.6.0",
 		"typescript": "^5.0.0"
 	},