Downgrade tinymce to v5

Temp commit Update yarn build with vite Update yarn build with vite Update yarn build with vite Update yarn build with vite
datalab-org · Dec 13, 2024 · da60bee · da60bee
1 parent dbbf48a
commit da60bee
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 9 deletions.
diff --git a/.docker/app_dockerfile b/.docker/app_dockerfile
@@ -24,7 +24,7 @@ ARG VUE_APP_QR_CODE_RESOLVER_URL=magic-qr-code-resolver-url
 ARG VUE_APP_AUTOMATICALLY_GENERATE_ID_DEFAULT=magic-generate-id-setting
 
 COPY webapp ./
-RUN --mount=type=bind,target=/.git,src=./.git VUE_APP_GIT_VERSION=$(node scripts/get-version.js) /node_modules/.bin/vite build
+RUN --mount=type=bind,target=/.git,src=./.git VUE_APP_GIT_VERSION=$(node scripts/get-version.js) /node_modules/.bin/vue-cli-service build
 
 FROM node:20-bullseye AS production
 

diff --git a/webapp/package.json b/webapp/package.json
@@ -45,7 +45,7 @@
     "qrcode-vue3": "^1.7.1",
     "redis": "^4.7.0",
     "stream-browserify": "^3.0.0",
-    "tinymce": "^7.5.1",
+    "tinymce": "5",
     "vue": "^3.5.13",
     "vue-qrcode-reader": "^5.5.11",
     "vue-router": "^4.5.0",

diff --git a/webapp/src/main.js b/webapp/src/main.js
@@ -96,9 +96,7 @@ import "tinymce/themes/silver";
 import "tinymce/skins/ui/oxide/skin.min.css";
 import "tinymce/skins/ui/oxide/content.min.css";
 import "tinymce/skins/content/default/content.min.css";
-//! Didn't manage to make /hr work, can't understand why
-// import "tinymce/plugins/hr";
-//!
+import "tinymce/plugins/hr";
 import "tinymce/plugins/image";
 import "tinymce/plugins/link";
 import "tinymce/plugins/lists";

diff --git a/webapp/yarn.lock b/webapp/yarn.lock
@@ -3874,10 +3874,10 @@ tinyexec@^0.3.0:
   resolved "https://registry.yarnpkg.com/tinyexec/-/tinyexec-0.3.1.tgz#0ab0daf93b43e2c211212396bdb836b468c97c98"
   integrity sha512-WiCJLEECkO18gwqIp6+hJg0//p23HXp4S+gGtAKu3mI2F2/sXC4FvHvXvB0zJVVaTPhx1/tOwdbRsa1sOBIKqQ==
 
-tinymce@^7.5.1:
-  version "7.5.1"
-  resolved "https://registry.yarnpkg.com/tinymce/-/tinymce-7.5.1.tgz#4c207ab930d3a073bf851ddd3a8aa44d8d94d7bd"
-  integrity sha512-GRXJUB0BEIOUHUEC+q9IjsgWGIAQ4Tn5t5hfpB/YR7No3oPgKHG03v1d3nbov9aqdyVW7Be+UD4I3ZerQG30VQ==
+tinymce@5:
+  version "5.10.9"
+  resolved "https://registry.yarnpkg.com/tinymce/-/tinymce-5.10.9.tgz#1dfacb3231c71a688d90ff44a0b3f2e91b3b9edf"
+  integrity sha512-5bkrors87X9LhYX2xq8GgPHrIgJYHl87YNs+kBcjQ5I3CiUgzo/vFcGvT3MZQ9QHsEeYMhYO6a5CLGGffR8hMg==
 
 tldts-core@^6.1.65:
   version "6.1.65"