Merge pull request #111 from latitudegames/modules/sserver-updates

Temporarily remove rete-connection-reroute-plugin

core/package.json

@@ -24,21 +24,20 @@
     "rete": "https://github.com/latitudegames/rete.git#master",
     "rete-area-plugin": "^0.2.1",
     "rete-connection-plugin": "^0.9.0",
-    "rete-connection-reroute-plugin": "^0.4.0",
     "rete-context-menu-plugin": "^0.6.0-rc.1",
     "rete-module-plugin": "^0.4.1",
     "rete-react-render-plugin": "^0.2.1",
     "uuid": "^8.3.2"
   },
   "devDependencies": {
-    "auto": "^10.32.0",
     "@rollup/plugin-babel": "^5.3.0",
     "@types/jest": "^26.0.24",
     "@types/lodash": "^4.14.172",
     "@types/node": "^16.4.3",
     "@types/pubsub-js": "^1.8.2",
     "@types/react": "^17.0.15",
     "@types/uuid": "^8.3.1",
+    "auto": "^10.32.0",
     "babel-loader": "^8.2.2",
     "copyfiles": "^2.4.1",
     "rimraf": "^3.0.2",

core/src/editor.ts

@@ -1,6 +1,6 @@
 import { NodeEditor } from 'rete'
 import ConnectionPlugin from 'rete-connection-plugin'
-import ConnectionReroutePlugin from 'rete-connection-reroute-plugin'
+// import ConnectionReroutePlugin from 'rete-connection-reroute-plugin'
 import ContextMenuPlugin from 'rete-context-menu-plugin'
 import ReactRenderPlugin from 'rete-react-render-plugin'
 import { Data } from 'rete/types/core/data'
@@ -60,12 +60,12 @@ export const initEditor = async function ({
   editor.thoth = thoth
   editor.tab = tab
 
-  // ██████╗ ██╗     ██╗   ██╗ ██████╗ ███████╗██╗███╗   ██╗███████╗
-  // ██╔══██╗██║     ██║   ██║██╔════╝ ██╔════╝██║████╗  ██║██╔════╝
-  // ██████╔╝██║     ██║   ██║██║  ███╗███████╗██║██╔██╗ ██║███████╗
-  // ██╔═══╝ ██║     ██║   ██║██║   ██║╚════██║██║██║╚██╗██║╚════██║
-  // ██║     ███████╗╚██████╔╝╚██████╔╝███████║██║██║ ╚████║███████║
-  // ╚═╝     ╚══════╝ ╚═════╝  ╚═════╝ ╚══════╝╚═╝╚═╝  ╚═══╝╚══════╝
+  // ██████╗ ██╗     ██╗   ██╗ ██████╗ ██╗███╗   ██╗███████╗
+  // ██╔══██╗██║     ██║   ██║██╔════╝ ██║████╗  ██║██╔════╝
+  // ██████╔╝██║     ██║   ██║██║  ███╗██║██╔██╗ ██║███████╗
+  // ██╔═══╝ ██║     ██║   ██║██║   ██║██║██║╚██╗██║╚════██║
+  // ██║     ███████╗╚██████╔╝╚██████╔╝██║██║ ╚████║███████║
+  // ╚═╝     ╚══════╝ ╚═════╝  ╚═════╝ ╚═╝╚═╝  ╚═══╝╚══════╝
 
   // History plugin for undo/redo
   editor.use(HistoryPlugin, { keyboard: false })
@@ -74,7 +74,8 @@ export const initEditor = async function ({
   // https://github.com/retejs/comment-plugin
   // connection plugin is used to render conections between nodes
   editor.use(ConnectionPlugin)
-  editor.use(ConnectionReroutePlugin)
+  // @seang: temporarily disabling because dependencies of ConnectionReroutePlugin are failing validation on server import of thoth-core
+  // editor.use(ConnectionReroutePlugin)
 
   // React rendering for the editor
   editor.use(ReactRenderPlugin, {

yarn.lock

@@ -12238,14 +12238,6 @@ rete-react-render-plugin@^0.2.1:
   resolved "https://registry.yarnpkg.com/rete-react-render-plugin/-/rete-react-render-plugin-0.2.1.tgz#71a6d73f18f850b85262563f678b40080a7b0e32"
   integrity sha512-2ZMXUP0v+EiejHVMqdrOmUwyDBHC2UDOJ/pFkElaZL1Kn/E40JZA5yzdBXi6ajYZI2DCzoW5ZBcA2Ihjtur8MQ==
 
-"rete@git+https://github.com/latitudegames/rete.git#master":
-  version "1.4.5"
-  uid "24565a81a2bbcdd4cd73b0a725977550cc8ff988"
-  resolved "git+https://github.com/latitudegames/rete.git#24565a81a2bbcdd4cd73b0a725977550cc8ff988"
-  dependencies:
-    lodash "^4.17.21"
-    watch "^1.0.2"
-
 "rete@https://github.com/latitudegames/rete.git#master":
   version "1.4.5"
   resolved "https://github.com/latitudegames/rete.git#24565a81a2bbcdd4cd73b0a725977550cc8ff988"