From 51119f22dffe873ef286438cadea256f75d84c66 Mon Sep 17 00:00:00 2001 From: Alois Klink Date: Sun, 27 Nov 2022 18:54:41 +0000 Subject: [PATCH 1/3] test(e2e): make gitgraph snapshots consistent Add a commit id to 'should render a simple gitgraph with a title', as otherwise the gitgraph renderer picks a random commit ID, and so image snapshots will be different. --- cypress/integration/rendering/gitGraph.spec.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cypress/integration/rendering/gitGraph.spec.js b/cypress/integration/rendering/gitGraph.spec.js index 0b5048b44..43f91a983 100644 --- a/cypress/integration/rendering/gitGraph.spec.js +++ b/cypress/integration/rendering/gitGraph.spec.js @@ -328,7 +328,7 @@ describe('Git Graph diagram', () => { title: simple gitGraph --- gitGraph - commit + commit id: "1-abcdefg" `, {} ); From 05b25db5ebb98b8bb8854f2e7d153c1bb3e96203 Mon Sep 17 00:00:00 2001 From: Alois Klink Date: Sun, 27 Nov 2022 19:13:53 +0000 Subject: [PATCH 2/3] chore(deps): remove dependency on `graphlib` `graphlib` has recently been replaced with the ESM version of graphlib bundled with [`dagre-d3-es`](https://www.npmjs.com/package/dagre-d3-es), in commit f687abb1 (chore: Use `graphlib` from `dagre-d3-es`, 2022-11-20) This means we can safely remove it from our dependencies list. Fixes: f687abb165795dfe959e87216bb111ebc7bc71cc --- packages/mermaid/package.json | 1 - pnpm-lock.yaml | 17 +++-------------- 2 files changed, 3 insertions(+), 15 deletions(-) diff --git a/packages/mermaid/package.json b/packages/mermaid/package.json index 4b24fb661..4479b8d45 100644 --- a/packages/mermaid/package.json +++ b/packages/mermaid/package.json @@ -58,7 +58,6 @@ "dagre-d3-es": "7.0.4", "dompurify": "2.4.1", "fast-clone": "^1.5.13", - "graphlib": "^2.1.8", "khroma": "^2.0.0", "lodash-es": "^4.17.21", "moment-mini": "^2.24.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index ebb71f65e..3d090b7a5 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -193,9 +193,6 @@ importers: fast-clone: specifier: ^1.5.13 version: 1.5.13 - graphlib: - specifier: ^2.1.8 - version: 2.1.8 khroma: specifier: ^2.0.0 version: 2.0.0 @@ -3634,7 +3631,7 @@ packages: /axios/0.21.4_debug@4.3.2: resolution: {integrity: sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==} dependencies: - follow-redirects: 1.15.2_debug@4.3.2 + follow-redirects: 1.15.2 transitivePeerDependencies: - debug dev: true @@ -6309,7 +6306,7 @@ packages: resolution: {integrity: sha512-XGozTsMPYkm+6b5QL3Z9wQcJjNYxp0CYn3U1gO7dwD6PAqU1SVWZxI9CCg3z+ml3YfqdPnrBehaBrnH2AGKbNA==} dev: true - /follow-redirects/1.15.2_debug@4.3.2: + /follow-redirects/1.15.2: resolution: {integrity: sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==} engines: {node: '>=4.0'} peerDependencies: @@ -6317,8 +6314,6 @@ packages: peerDependenciesMeta: debug: optional: true - dependencies: - debug: 4.3.2 dev: true /foreground-child/2.0.0: @@ -6665,12 +6660,6 @@ packages: resolution: {integrity: sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ==} dev: true - /graphlib/2.1.8: - resolution: {integrity: sha512-jcLLfkpoVGmH7/InMC/1hIvOPSUh38oJtGhvrOFGzioE1DZ+0YW16RgmOJhHiuWTvGiJQ9Z1Ik43JvkRPRvE+A==} - dependencies: - lodash: 4.17.21 - dev: false - /gray-matter/4.0.3: resolution: {integrity: sha512-5v6yZd4JK3eMI3FqqCouswVqwugaA9r4dNZB1wwcmrD02QkV5H0y7XBQW8QwQqEaZY1pM9aqORSORhJRdNK44Q==} engines: {node: '>=6.0'} @@ -6911,7 +6900,7 @@ packages: engines: {node: '>=8.0.0'} dependencies: eventemitter3: 4.0.7 - follow-redirects: 1.15.2_debug@4.3.2 + follow-redirects: 1.15.2 requires-port: 1.0.0 transitivePeerDependencies: - debug From 2984e4fc574fe579209c3696786e85734025426e Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 28 Nov 2022 04:53:07 +0000 Subject: [PATCH 3/3] chore(deps): update pnpm to v7.17.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index aec72da87..3d01db5d7 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "version": "9.2.2", "description": "Markdownish syntax for generating flowcharts, sequence diagrams, class diagrams, gantt charts and git graphs.", "type": "module", - "packageManager": "pnpm@7.17.0", + "packageManager": "pnpm@7.17.1", "keywords": [ "diagram", "markdown",