From 10a4a2a7e274a9f5bc9133e00aa6b5e68a9832f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Charlotte=20=F0=9F=A6=9D=20Delenk?= Date: Sun, 11 Sep 2022 19:20:50 +0100 Subject: [PATCH] fix akkoma-admin-fe build --- akkoma/akkoma-admin.patch | 395 +++++++++++++++++++++++++++++++------- akkoma/default.nix | 18 ++ 2 files changed, 340 insertions(+), 73 deletions(-) diff --git a/akkoma/akkoma-admin.patch b/akkoma/akkoma-admin.patch index 7bd9689..b01beba 100644 --- a/akkoma/akkoma-admin.patch +++ b/akkoma/akkoma-admin.patch @@ -1,27 +1,51 @@ diff --git a/package.json b/package.json -index f267be19..0d5c2ead 100644 +index f267be19..fb806527 100644 --- a/package.json +++ b/package.json -@@ -32,7 +32,8 @@ +@@ -31,14 +31,12 @@ + "type": "git", "url": "git+https://akkoma.dev/AkkomaGang/admin-fe.git" }, - "resolutions": { +- "resolutions": { - "prosemirror-model": "1.9.1" -+ "eve": "https://github.com/adobe-webplatform/eve.git", -+ "raphael": "https://github.com/nhn/raphael.git#78a6ed3ec269f33b6457b0ec66f8c3d1f2ed70e0" - }, +- }, "bugs": { "url": "https://akkoma.dev/AkkomaGang/admin-fe/-/issues" -@@ -47,6 +48,7 @@ - "dropzone": "5.2.0", - "echarts": "4.1.0", - "element-ui": "^2.13.0", -+ "eve": "https://github.com/adobe-webplatform/eve.git", - "file-saver": "1.3.8", - "fuse.js": "3.4.2", - "js-cookie": "2.2.0", + }, + "dependencies": { + "@babel/runtime": "^7.3.4", ++ "@toast-ui/editor": "^3.2.0", + "axios": "0.18.0", + "clipboard": "1.7.1", + "codemirror": "5.39.2", +@@ -65,7 +63,6 @@ + "sortablejs": "1.7.0", + "tiptap": "^1.29.6", + "tiptap-extensions": "^1.32.7", +- "tui-editor": "1.2.7", + "vue": "^2.6.8", + "vue-count-to": "1.0.13", + "vue-i18n": "^8.9.0", +diff --git a/src/components/element-ui/MarkdownEditor/index.vue b/src/components/element-ui/MarkdownEditor/index.vue +index 7ae9fd40..18114701 100644 +--- a/src/components/element-ui/MarkdownEditor/index.vue ++++ b/src/components/element-ui/MarkdownEditor/index.vue +@@ -5,10 +5,10 @@ +