From d1b61a1489df3592574493ca1fe55a92ab3276e8 Mon Sep 17 00:00:00 2001
From: Dominik Pschenitschni <mail@celement.de>
Date: Mon, 11 Oct 2021 18:49:44 +0200
Subject: [PATCH] feat: some vue3 package improvements

- add codemirror as direct dependency
- remove @vue/runtime-dom (was needed for volar with vue2)
- remove setting for using volar with vue2
---
 package.json  |  4 ++--
 tsconfig.json |  5 -----
 yarn.lock     | 42 +++++++++---------------------------------
 3 files changed, 11 insertions(+), 40 deletions(-)

diff --git a/package.json b/package.json
index c6acb54e5..800154d42 100644
--- a/package.json
+++ b/package.json
@@ -20,6 +20,7 @@
     "@vue/compat": "3.2.14",
     "bulma": "0.9.3",
     "camel-case": "4.1.2",
+    "codemirror": "^5.63.1",
     "copy-to-clipboard": "3.3.1",
     "date-fns": "2.24.0",
     "dompurify": "2.3.3",
@@ -52,9 +53,8 @@
     "@typescript-eslint/eslint-plugin": "4.32.0",
     "@typescript-eslint/parser": "4.32.0",
     "@vitejs/plugin-legacy": "^1.6.1",
-    "@vitejs/plugin-vue": "^1.9.0",
+    "@vitejs/plugin-vue": "^1.9.2",
     "@vue/eslint-config-typescript": "7.0.0",
-    "@vue/runtime-dom": "latest",
     "autoprefixer": "10.3.6",
     "axios": "0.21.4",
     "browserslist": "4.17.3",
diff --git a/tsconfig.json b/tsconfig.json
index 4e9b15a71..8830343a8 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -40,9 +40,4 @@
     "tests/**/*.ts",
     "tests/**/*.tsx"
   ],
-
-  // https://github.com/johnsoncodehk/volar#using
-  "vueCompilerOptions": {
-    "experimentalCompatMode": 2
-  },
 }
diff --git a/yarn.lock b/yarn.lock
index eb54f83f3..7bf4580f8 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1635,10 +1635,10 @@
     regenerator-runtime "^0.13.9"
     systemjs "^6.10.3"
 
-"@vitejs/plugin-vue@^1.9.0":
-  version "1.9.0"
-  resolved "https://registry.yarnpkg.com/@vitejs/plugin-vue/-/plugin-vue-1.9.0.tgz#ae458a2eaac1d06efac8d71a4427d5d742466d72"
-  integrity sha512-TQB87f8baZsTZO/g7Az/dTCwV8eDxwkrP8hMl8HpwLJz/NKvmXtBqa7bYg8GKWNwqjy+pBRLdgiML+BI3HphOw==
+"@vitejs/plugin-vue@^1.9.2":
+  version "1.9.3"
+  resolved "https://registry.yarnpkg.com/@vitejs/plugin-vue/-/plugin-vue-1.9.3.tgz#93d61893ce6c723d0209af0483ec8b91a2cd811f"
+  integrity sha512-yW6H/q+4Mc2PcVjSOelcsMrg/k15DnMUz8jyCFsI04emc3aLwo4AoofUfGnjHUkgirrDxSJLVqQVGhonQ3yykA==
 
 "@vue/compat@3.2.14":
   version "3.2.14"
@@ -1711,13 +1711,6 @@
   dependencies:
     "@vue/shared" "3.2.14"
 
-"@vue/reactivity@3.2.19":
-  version "3.2.19"
-  resolved "https://registry.yarnpkg.com/@vue/reactivity/-/reactivity-3.2.19.tgz#fc6e0f0106f295226835cfed5ff5f84d927bea65"
-  integrity sha512-FtachoYs2SnyrWup5UikP54xDX6ZJ1s5VgHcJp4rkGoutU3Ry61jhs+nCX7J64zjX992Mh9gGUC0LqTs8q9vCA==
-  dependencies:
-    "@vue/shared" "3.2.19"
-
 "@vue/ref-transform@3.2.14":
   version "3.2.14"
   resolved "https://registry.yarnpkg.com/@vue/ref-transform/-/ref-transform-3.2.14.tgz#aa73cb99ab08d4fc808eba633b9c02d954cda31a"
@@ -1737,14 +1730,6 @@
     "@vue/reactivity" "3.2.14"
     "@vue/shared" "3.2.14"
 
-"@vue/runtime-core@3.2.19":
-  version "3.2.19"
-  resolved "https://registry.yarnpkg.com/@vue/runtime-core/-/runtime-core-3.2.19.tgz#807715b7f4728abb84fa4a8efdbe37d8ddb4c6d3"
-  integrity sha512-qArZSWKxWsgKfxk9BelZ32nY0MZ31CAW2kUUyVJyxh4cTfHaXGbjiQB5JgsvKc49ROMNffv9t3/qjasQqAH+RQ==
-  dependencies:
-    "@vue/reactivity" "3.2.19"
-    "@vue/shared" "3.2.19"
-
 "@vue/runtime-dom@3.2.14":
   version "3.2.14"
   resolved "https://registry.yarnpkg.com/@vue/runtime-dom/-/runtime-dom-3.2.14.tgz#ca0d962fcb9dec37c8904533a3246fdc50ecae66"
@@ -1754,15 +1739,6 @@
     "@vue/shared" "3.2.14"
     csstype "^2.6.8"
 
-"@vue/runtime-dom@latest":
-  version "3.2.19"
-  resolved "https://registry.yarnpkg.com/@vue/runtime-dom/-/runtime-dom-3.2.19.tgz#7e8bf645754703e360fa132e4be9113edf2377bb"
-  integrity sha512-hIRboxXwafeHhbZEkZYNV0MiJXPNf4fP0X6hM2TJb0vssz8BKhD9cF92BkRgZztTQevecbhk0gu4uAPJ3dxL9A==
-  dependencies:
-    "@vue/runtime-core" "3.2.19"
-    "@vue/shared" "3.2.19"
-    csstype "^2.6.8"
-
 "@vue/server-renderer@3.2.14":
   version "3.2.14"
   resolved "https://registry.yarnpkg.com/@vue/server-renderer/-/server-renderer-3.2.14.tgz#731cf7d9666e7ac6d56d8c476a76dd260bf0d2b4"
@@ -1776,11 +1752,6 @@
   resolved "https://registry.yarnpkg.com/@vue/shared/-/shared-3.2.14.tgz#9b882098a004b995124b7577b357135a66d922ef"
   integrity sha512-Yndg5Q99hbP76oU0UXQ9V4O0oQ/xjIToJJjmv1BHPUoaebv40vt0YGahNCb6v9WRRXZIMJOQ+4DmqsGhXRi70w==
 
-"@vue/shared@3.2.19":
-  version "3.2.19"
-  resolved "https://registry.yarnpkg.com/@vue/shared/-/shared-3.2.19.tgz#111ec3da18337d86274446984c49925b1b2b2dd7"
-  integrity sha512-Knqhx7WieLdVgwCAZgTVrDCXZ50uItuecLh9JdLC8O+a5ayaSyIQYveUK3hCRNC7ws5zalHmZwfdLMGaS8r4Ew==
-
 abab@^2.0.3, abab@^2.0.5:
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.5.tgz#c0b678fb32d60fc1219c784d6a826fe385aeb79a"
@@ -2510,6 +2481,11 @@ codemirror@^5.61.0:
   resolved "https://registry.yarnpkg.com/codemirror/-/codemirror-5.62.2.tgz#bce6d19c9829e6e788f83886d48ecf5c1e106e65"
   integrity sha512-tVFMUa4J3Q8JUd1KL9yQzQB0/BJt7ZYZujZmTPgo/54Lpuq3ez4C8x/ATUY/wv7b7X3AUq8o3Xd+2C5ZrCGWHw==
 
+codemirror@^5.63.1:
+  version "5.63.1"
+  resolved "https://registry.yarnpkg.com/codemirror/-/codemirror-5.63.1.tgz#b0b9e8444206fd6a43a58a4b31d5740bb891fa57"
+  integrity sha512-baivaNZreZOGh1/tYyTvCupC9NeWk7qlZeGUDi4nFKj/J0JU8FYKZND4QqLw70P7HOttlCt4JJAOj9GoIhHEkA==
+
 collect-v8-coverage@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/collect-v8-coverage/-/collect-v8-coverage-1.0.1.tgz#cc2c8e94fc18bbdffe64d6534570c8a673b27f59"