Merge branch 'develop' into docs/5572_node-version-contributing-md

docker-compose.yml

@@ -1,4 +1,3 @@
-version: '3.9'
 services:
   mermaid:
     build:
@@ -8,7 +7,7 @@ services:
     tty: true
     working_dir: /mermaid
     mem_limit: '8G'
-    entrypoint: docker-entrypoint.sh
+    entrypoint: ./docker-entrypoint.sh
     environment:
       - NODE_OPTIONS=--max_old_space_size=8192
     volumes:
@@ -16,6 +15,7 @@ services:
       - root_cache:/root/.cache
       - root_local:/root/.local
       - root_npm:/root/.npm
+      - /tmp:/tmp
     ports:
       - 9000:9000
       - 3333:3333

package.json

@@ -126,10 +126,5 @@
   },
   "nyc": {
     "report-dir": "coverage/cypress"
-  },
-  "pnpm": {
-    "patchedDependencies": {
-      "cytoscape@3.28.1": "patches/cytoscape@3.28.1.patch"
-    }
   }
 }

packages/mermaid/package.json

@@ -70,7 +70,7 @@
   "dependencies": {
     "@braintree/sanitize-url": "^7.0.1",
     "@mermaid-js/parser": "workspace:^",
-    "cytoscape": "^3.28.1",
+    "cytoscape": "^3.29.2",
     "cytoscape-cose-bilkent": "^4.1.0",
     "d3": "^7.9.0",
     "d3-sankey": "^0.12.3",
@@ -88,7 +88,7 @@
   },
   "devDependencies": {
     "@adobe/jsonschema2md": "^8.0.0",
-    "@types/cytoscape": "^3.19.16",
+    "@types/cytoscape": "^3.21.4",
     "@types/d3": "^7.4.3",
     "@types/d3-sankey": "^0.12.4",
     "@types/d3-scale": "^4.0.8",

patches/cytoscape@3.28.1.patch

@@ -1,20 +0,0 @@
-diff --git a/package.json b/package.json
-index f2f77fa79c99382b079f4051ed51eafe8d2379c8..0bfddf55394e86f3a386eb7ab681369d410bae07 100644
---- a/package.json
-+++ b/package.json
-@@ -30,7 +30,15 @@
-   "engines": {
-     "node": ">=0.10"
-   },
-+  "exports": {
-+    ".": {
-+      "import": "./dist/cytoscape.umd.js",
-+      "default": "./dist/cytoscape.cjs.js"
-+    },
-+    "./*": "./*"
-+  },
-   "main": "dist/cytoscape.cjs.js",
-+  "module": "dist/cytoscape.umd.js",
-   "unpkg": "dist/cytoscape.min.js",
-   "jsdelivr": "dist/cytoscape.min.js",
-   "scripts": {