Merge branch 'develop' into release/10.9.0

* develop: Update docs Lychee ignore chrome webstore Update link chore(deps): update all patch dependencies build(docs): vendor CSS dependencies chore(deps): update all minor dependencies Ran lint:fix Fix chrome webstore url causing 404 Resolves E2E testing issues and issue #5343
mermaid-js · Mar 5, 2024 · b077fed · b077fed
2 parents 38fcc28 + 5aa884f
commit b077fed
Show file tree

Hide file tree

Showing 8 changed files with 2,266 additions and 2,532 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,2 +1,2 @@
-FROM node:20.11.0-alpine3.19 AS base
+FROM node:20.11.1-alpine3.19 AS base
 RUN wget -qO- https://get.pnpm.io/install.sh | ENV="$HOME/.shrc" SHELL="$(which sh)" sh -
diff --git a/cypress/integration/rendering/gitGraph.spec.js b/cypress/integration/rendering/gitGraph.spec.js
@@ -946,11 +946,11 @@ gitGraph TB:
   it('46: should render GitGraph with merge back and merge forward', () => {
     imgSnapshotTest(
       `gitGraph LR:
-      commit
+      commit id:"1-abcdefg"
 
       branch branch-A
       branch branch-B
-      commit
+      commit id:"2-abcdefg"
 
       checkout branch-A
       merge branch-B
@@ -964,11 +964,11 @@ gitGraph TB:
   it('47: should render GitGraph with merge back and merge forward | Vertical Branch', () => {
     imgSnapshotTest(
       `gitGraph TB:
-      commit
+      commit id:"1-abcdefg"
 
       branch branch-A
       branch branch-B
-      commit
+      commit id:"2-abcdefg"
 
       checkout branch-A
       merge branch-B
@@ -982,10 +982,10 @@ gitGraph TB:
   it('48: should render GitGraph with merge on a new branch | Vertical Branch', () => {
     imgSnapshotTest(
       `gitGraph LR:
-      commit
+      commit id:"1-abcdefg"
 
       branch branch-B order: 2
-      commit
+      commit id:"2-abcdefg"
 
       branch branch-A
       merge main
@@ -999,10 +999,10 @@ gitGraph TB:
   it('49: should render GitGraph with merge on a new branch | Vertical Branch', () => {
     imgSnapshotTest(
       `gitGraph TB:
-      commit
+      commit id:"1-abcdefg"
 
       branch branch-B order: 2
-      commit
+      commit id:"2-abcdefg"
 
       branch branch-A
       merge main

diff --git a/docs/config/setup/interfaces/mermaidAPI.RenderResult.md b/docs/config/setup/interfaces/mermaidAPI.RenderResult.md
@@ -14,10 +14,6 @@
 
 • `Optional` **bindFunctions**: (`element`: `Element`) => `void`
 
-#### Type declaration
-
-▸ (`element`): `void`
-
 Bind function to be called after the svg has been inserted into the DOM.
 This is necessary for adding event listeners to the elements in the svg.
 
@@ -27,6 +23,10 @@ div.innerHTML = svg;
 bindFunctions?.(div); // To call bindFunctions only if it's present.
 ```
 
+#### Type declaration
+
+▸ (`element`): `void`
+
 ##### Parameters
 
 | Name      | Type      |

diff --git a/package.json b/package.json
@@ -4,7 +4,7 @@
   "version": "10.2.4",
   "description": "Markdownish syntax for generating flowcharts, sequence diagrams, class diagrams, gantt charts and git graphs.",
   "type": "module",
-  "packageManager": "[email protected].1",
+  "packageManager": "[email protected].4",
   "keywords": [
     "diagram",
     "markdown",

diff --git a/packages/mermaid/src/docs/.vitepress/components/TopBar.vue b/packages/mermaid/src/docs/.vitepress/components/TopBar.vue
@@ -4,7 +4,7 @@
   >
     <p class="flex-grow text-center tracking-wide text-text">
       <a
-        href="https://www.mermaidchart.com/app/user/billing/checkout"
+        href="https://www.mermaidchart.com/app/landing"
         target="_blank"
         class="unstyled flex-grow tracking-wide plausible-event-name=bannerClick"
       >

diff --git a/packages/mermaid/src/docs/.vitepress/theme/custom.css b/packages/mermaid/src/docs/.vitepress/theme/custom.css
@@ -1,5 +1,5 @@
-@import url('https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css');
-@import url('https://cdn.jsdelivr.net/npm/@mdi/font@6.9.96/css/materialdesignicons.min.css');
+@import 'font-awesome/css/font-awesome.min.css';
+@import '@mdi/font/css/materialdesignicons.min.css';
 
 :root {
   --vp-c-brand: #ff3670;

diff --git a/packages/mermaid/src/docs/package.json b/packages/mermaid/src/docs/package.json
@@ -15,7 +15,9 @@
     "fetch-contributors": "tsx .vitepress/scripts/fetch-contributors.ts"
   },
   "dependencies": {
+    "@mdi/font": "^6.9.96",
     "@vueuse/core": "^10.1.0",
+    "font-awesome": "^4.7.0",
     "jiti": "^1.18.2",
     "vue": "^3.3",
     "mermaid": "workspace:^"
@@ -32,7 +34,7 @@
     "unplugin-vue-components": "^0.26.0",
     "vite": "^4.5.2",
     "vite-plugin-pwa": "^0.19.0",
-    "vitepress": "1.0.0-rc.42",
+    "vitepress": "1.0.0-rc.44",
     "workbox-window": "^7.0.0"
   }
 }