From 498008454b73875d6d36e158c75f5572f731c957 Mon Sep 17 00:00:00 2001 From: Reda Al Sulais Date: Wed, 27 Sep 2023 16:14:45 +0300 Subject: [PATCH] fix: fix d3 bundled multiple times * update `d3` version to `7.8.5` exclude the `7.4.0` version * override `d3-sankey` and `@types/d3-sankey` dependencies versions * move `@types/d3-scale` and `@types/d3-scale-chromatic` to devDependencies * update all `d3` related dependencies --- package.json | 7 + packages/mermaid-example-diagram/package.json | 2 +- packages/mermaid/package.json | 15 +- pnpm-lock.yaml | 162 ++++++++---------- 4 files changed, 85 insertions(+), 101 deletions(-) diff --git a/package.json b/package.json index beb76282a3..e9734b1a5f 100644 --- a/package.json +++ b/package.json @@ -127,5 +127,12 @@ }, "nyc": { "report-dir": "coverage/cypress" + }, + "pnpm": { + "overrides": { + "d3-sankey>d3-array": "^3.2.4", + "d3-sankey>d3-shape": "^3.2.0", + "@types/d3-sankey>@types/d3-shape": "^3.1.3" + } } } diff --git a/packages/mermaid-example-diagram/package.json b/packages/mermaid-example-diagram/package.json index dc468a6c73..9c7bfbf880 100644 --- a/packages/mermaid-example-diagram/package.json +++ b/packages/mermaid-example-diagram/package.json @@ -42,7 +42,7 @@ "cytoscape": "^3.23.0", "cytoscape-cose-bilkent": "^4.1.0", "cytoscape-fcose": "^2.1.0", - "d3": "^7.0.0", + "d3": "^7.8.5", "khroma": "^2.0.0", "non-layered-tidy-tree-layout": "^2.0.2" }, diff --git a/packages/mermaid/package.json b/packages/mermaid/package.json index 23138003f6..f3ecd64cf5 100644 --- a/packages/mermaid/package.json +++ b/packages/mermaid/package.json @@ -60,12 +60,10 @@ }, "dependencies": { "@braintree/sanitize-url": "^6.0.1", - "@types/d3-scale": "^4.0.3", - "@types/d3-scale-chromatic": "^3.0.0", "cytoscape": "^3.23.0", "cytoscape-cose-bilkent": "^4.1.0", "cytoscape-fcose": "^2.1.0", - "d3": "^7.4.0", + "d3": "^7.8.5", "d3-sankey": "^0.12.3", "dagre-d3-es": "7.0.10", "dayjs": "^1.11.7", @@ -83,11 +81,12 @@ "devDependencies": { "@adobe/jsonschema2md": "^7.1.4", "@types/cytoscape": "^3.19.9", - "@types/d3": "^7.4.0", - "@types/d3-sankey": "^0.12.1", - "@types/d3-scale": "^4.0.3", - "@types/d3-selection": "^3.0.5", - "@types/d3-shape": "^3.1.1", + "@types/d3": "^7.4.1", + "@types/d3-sankey": "^0.12.2", + "@types/d3-scale": "^4.0.5", + "@types/d3-scale-chromatic": "^3.0.0", + "@types/d3-selection": "^3.0.7", + "@types/d3-shape": "^3.1.3", "@types/dompurify": "^3.0.2", "@types/jsdom": "^21.1.1", "@types/lodash-es": "^4.17.7", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 8dc223204d..c83bf9e344 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -4,6 +4,11 @@ settings: autoInstallPeers: true excludeLinksFromLockfile: false +overrides: + d3-sankey>d3-array: ^3.2.4 + d3-sankey>d3-shape: ^3.2.0 + '@types/d3-sankey>@types/d3-shape': ^3.1.3 + importers: .: @@ -194,12 +199,6 @@ importers: '@braintree/sanitize-url': specifier: ^6.0.1 version: 6.0.2 - '@types/d3-scale': - specifier: ^4.0.3 - version: 4.0.3 - '@types/d3-scale-chromatic': - specifier: ^3.0.0 - version: 3.0.0 cytoscape: specifier: ^3.23.0 version: 3.23.0 @@ -210,8 +209,8 @@ importers: specifier: ^2.1.0 version: 2.1.0(cytoscape@3.23.0) d3: - specifier: ^7.4.0 - version: 7.8.2 + specifier: ^7.8.5 + version: 7.8.5 d3-sankey: specifier: ^0.12.3 version: 0.12.3 @@ -259,17 +258,23 @@ importers: specifier: ^3.19.9 version: 3.19.9 '@types/d3': - specifier: ^7.4.0 - version: 7.4.0 + specifier: ^7.4.1 + version: 7.4.1 '@types/d3-sankey': - specifier: ^0.12.1 - version: 0.12.1 + specifier: ^0.12.2 + version: 0.12.2 + '@types/d3-scale': + specifier: ^4.0.5 + version: 4.0.5 + '@types/d3-scale-chromatic': + specifier: ^3.0.0 + version: 3.0.0 '@types/d3-selection': - specifier: ^3.0.5 - version: 3.0.5 + specifier: ^3.0.7 + version: 3.0.7 '@types/d3-shape': - specifier: ^3.1.1 - version: 3.1.1 + specifier: ^3.1.3 + version: 3.1.3 '@types/dompurify': specifier: ^3.0.2 version: 3.0.2 @@ -394,8 +399,8 @@ importers: specifier: ^2.1.0 version: 2.1.0(cytoscape@3.23.0) d3: - specifier: ^7.0.0 - version: 7.8.2 + specifier: ^7.8.5 + version: 7.8.5 khroma: specifier: ^2.0.0 version: 2.0.0 @@ -4336,13 +4341,13 @@ packages: /@types/d3-axis@3.0.1: resolution: {integrity: sha512-zji/iIbdd49g9WN0aIsGcwcTBUkgLsCSwB+uH+LPVDAiKWENMtI3cJEWt+7/YYwelMoZmbBfzA3qCdrZ2XFNnw==} dependencies: - '@types/d3-selection': 3.0.5 + '@types/d3-selection': 3.0.7 dev: true /@types/d3-brush@3.0.1: resolution: {integrity: sha512-B532DozsiTuQMHu2YChdZU0qsFJSio3Q6jmBYGYNp3gMDzBmuFFgPt9qKA4VYuLZMp4qc6eX7IUFUEsvHiXZAw==} dependencies: - '@types/d3-selection': 3.0.5 + '@types/d3-selection': 3.0.7 dev: true /@types/d3-chord@3.0.1: @@ -4371,7 +4376,7 @@ packages: /@types/d3-drag@3.0.1: resolution: {integrity: sha512-o1Va7bLwwk6h03+nSM8dpaGEYnoIG19P0lKqlic8Un36ymh9NSkNFX1yiXMKNMx8rJ0Kfnn2eovuFaL6Jvj0zA==} dependencies: - '@types/d3-selection': 3.0.5 + '@types/d3-selection': 3.0.7 dev: true /@types/d3-dsv@3.0.0: @@ -4412,10 +4417,6 @@ packages: '@types/d3-color': 3.1.0 dev: true - /@types/d3-path@1.0.9: - resolution: {integrity: sha512-NaIeSIBiFgSC6IGUBjZWcscUJEq7vpVu7KthHN8eieTV9d9MqkSOZLH4chq1PmcKy06PNe3axLeKmRIyxJ+PZQ==} - dev: true - /@types/d3-path@3.0.0: resolution: {integrity: sha512-0g/A+mZXgFkQxN3HniRDbXMN79K3CdTpLsevj+PXiTcb2hVyvkZUBg37StmgCQkaD84cUJ4uaDAWq7UJOQy2Tg==} dev: true @@ -4432,32 +4433,28 @@ packages: resolution: {integrity: sha512-IIE6YTekGczpLYo/HehAy3JGF1ty7+usI97LqraNa8IiDur+L44d0VOjAvFQWJVdZOJHukUJw+ZdZBlgeUsHOQ==} dev: true - /@types/d3-sankey@0.12.1: - resolution: {integrity: sha512-10X6l6lXB42udBNX9/fDN+kJuooifSMk7+x4U9815eobavldqis4wDdFQUQjMazh+qlzsUZsGzXKxfWFUVt+3w==} + /@types/d3-sankey@0.12.2: + resolution: {integrity: sha512-gOikQBgTsnV2vGTD+RqdF6r3hGSunkkj57YNqGWdwKg+f7DwTK9ynNahatpQ5rhJbXxhld/1lomR/DnnGyqrPA==} dependencies: - '@types/d3-shape': 1.3.8 + '@types/d3-shape': 3.1.3 dev: true /@types/d3-scale-chromatic@3.0.0: resolution: {integrity: sha512-dsoJGEIShosKVRBZB0Vo3C8nqSDqVGujJU6tPznsBJxNJNwMF8utmS83nvCBKQYPpjCzaaHcrf66iTRpZosLPw==} + dev: true - /@types/d3-scale@4.0.3: - resolution: {integrity: sha512-PATBiMCpvHJSMtZAMEhc2WyL+hnzarKzI6wAHYjhsonjWJYGq5BXTzQjv4l8m2jO183/4wZ90rKvSeT7o72xNQ==} + /@types/d3-scale@4.0.5: + resolution: {integrity: sha512-w/C++3W394MHzcLKO2kdsIn5KKNTOqeQVzyPSGPLzQbkPw/jpeaGtSRlakcKevGgGsjJxGsbqS0fPrVFDbHrDA==} dependencies: '@types/d3-time': 3.0.0 - - /@types/d3-selection@3.0.5: - resolution: {integrity: sha512-xCB0z3Hi8eFIqyja3vW8iV01+OHGYR2di/+e+AiOcXIOrY82lcvWW8Ke1DYE/EUVMsBl4Db9RppSBS3X1U6J0w==} dev: true - /@types/d3-shape@1.3.8: - resolution: {integrity: sha512-gqfnMz6Fd5H6GOLYixOZP/xlrMtJms9BaS+6oWxTKHNqPGZ93BkWWupQSCYm6YHqx6h9wjRupuJb90bun6ZaYg==} - dependencies: - '@types/d3-path': 1.0.9 + /@types/d3-selection@3.0.7: + resolution: {integrity: sha512-qoj2O7KjfqCobmtFOth8FMvjwMVPUAAmn6xiUbLl1ld7vQCPgffvyV5BBcEFfqWdilAUm+3zciU/3P3vZrUMlg==} dev: true - /@types/d3-shape@3.1.1: - resolution: {integrity: sha512-6Uh86YFF7LGg4PQkuO2oG6EMBRLuW9cbavUW46zkIO5kuS2PfTqo2o9SkgtQzguBHbLgNnU90UNsITpsX1My+A==} + /@types/d3-shape@3.1.3: + resolution: {integrity: sha512-cHMdIq+rhF5IVwAV7t61pcEXfEHsEsrbBUPkFGBwTXuxtTAkBBrnrNA8++6OWm3jwVsXoZYQM8NEekg6CPJ3zw==} dependencies: '@types/d3-path': 3.0.0 dev: true @@ -4468,6 +4465,7 @@ packages: /@types/d3-time@3.0.0: resolution: {integrity: sha512-sZLCdHvBUcNby1cB6Fd3ZBrABbjz3v1Vm90nysCQ6Vt7vd6e/h9Lt7SiJUoEX0l4Dzc7P5llKyhqSi1ycSf1Hg==} + dev: true /@types/d3-timer@3.0.0: resolution: {integrity: sha512-HNB/9GHqu7Fo8AQiugyJbv6ZxYz58wef0esl4Mv828w1ZKpAshw/uFWVDUcIB9KKFeFKoxS3cHY07FFgtTRZ1g==} @@ -4476,18 +4474,18 @@ packages: /@types/d3-transition@3.0.2: resolution: {integrity: sha512-jo5o/Rf+/u6uerJ/963Dc39NI16FQzqwOc54bwvksGAdVfvDrqDpVeq95bEvPtBwLCVZutAEyAtmSyEMxN7vxQ==} dependencies: - '@types/d3-selection': 3.0.5 + '@types/d3-selection': 3.0.7 dev: true /@types/d3-zoom@3.0.1: resolution: {integrity: sha512-7s5L9TjfqIYQmQQEUcpMAcBOahem7TRoSO/+Gkz02GbMVuULiZzjF2BOdw291dbO2aNon4m2OdFsRGaCq2caLQ==} dependencies: '@types/d3-interpolate': 3.0.1 - '@types/d3-selection': 3.0.5 + '@types/d3-selection': 3.0.7 dev: true - /@types/d3@7.4.0: - resolution: {integrity: sha512-jIfNVK0ZlxcuRDKtRS/SypEyOQ6UHaFQBKv032X45VvxSJ6Yi5G9behy9h6tNTHTDGh5Vq+KbmBjUWLgY4meCA==} + /@types/d3@7.4.1: + resolution: {integrity: sha512-lBpYmbHTCtFKO1DB1R7E9dXp9/g1F3JXSGOF7iKPZ+wRmYg/Q6tCRHODGOc5Qk25fJRe2PI60EDRf2HLPUncMA==} dependencies: '@types/d3-array': 3.0.3 '@types/d3-axis': 3.0.1 @@ -4510,10 +4508,10 @@ packages: '@types/d3-polygon': 3.0.0 '@types/d3-quadtree': 3.0.2 '@types/d3-random': 3.0.1 - '@types/d3-scale': 4.0.3 + '@types/d3-scale': 4.0.5 '@types/d3-scale-chromatic': 3.0.0 - '@types/d3-selection': 3.0.5 - '@types/d3-shape': 3.1.1 + '@types/d3-selection': 3.0.7 + '@types/d3-shape': 3.1.3 '@types/d3-time': 3.0.0 '@types/d3-time-format': 4.0.0 '@types/d3-timer': 3.0.0 @@ -7622,14 +7620,8 @@ packages: lodash: 4.17.21 dev: false - /d3-array@2.12.1: - resolution: {integrity: sha512-B0ErZK/66mHtEsR1TkPEEkwdy+WDesimkM5gpZr5Dsg54BiTA5RXtYW5qTLIAcekaS9xfZrzBLF/OAkB3Qn1YQ==} - dependencies: - internmap: 1.0.1 - dev: false - - /d3-array@3.2.0: - resolution: {integrity: sha512-3yXFQo0oG3QCxbF06rMPFyGRMGJNS7NvsV1+2joOjbBE+9xvWQ8+GcMJAjRCzw06zQ3/arXeJgbPYcjUCuC+3g==} + /d3-array@3.2.4: + resolution: {integrity: sha512-tdQAmyA18i4J7wprpYq8ClcxZy3SC31QMeByyCFyRt7BVHdREQZ5lpzoe5mFEYZUWe+oq8HBvk9JjpibyEV4Jg==} engines: {node: '>=12'} dependencies: internmap: 2.0.3 @@ -7655,7 +7647,7 @@ packages: resolution: {integrity: sha512-VE5S6TNa+j8msksl7HwjxMHDM2yNK3XCkusIlpX5kwauBfXuyLAtNg9jCp/iHH61tgI4sb6R/EIMWCqEIdjT/g==} engines: {node: '>=12'} dependencies: - d3-path: 3.0.1 + d3-path: 3.1.0 dev: false /d3-color@3.1.0: @@ -7663,15 +7655,15 @@ packages: engines: {node: '>=12'} dev: false - /d3-contour@4.0.0: - resolution: {integrity: sha512-7aQo0QHUTu/Ko3cP9YK9yUTxtoDEiDGwnBHyLxG5M4vqlBkO/uixMRele3nfsfj6UXOcuReVpVXzAboGraYIJw==} + /d3-contour@4.0.2: + resolution: {integrity: sha512-4EzFTRIikzs47RGmdxbeUvLWtGedDUNkTcmzoeyg4sP/dvCexO47AaQL7VKy/gul85TOxw+IBgA8US2xwbToNA==} engines: {node: '>=12'} dependencies: - d3-array: 3.2.0 + d3-array: 3.2.4 dev: false - /d3-delaunay@6.0.2: - resolution: {integrity: sha512-IMLNldruDQScrcfT+MWnazhHbDJhcRJyOEBAJfwQnHle1RPh6WDuLvxNArUju2VSMSUuKlY5BGHRJ2cYyoFLQQ==} + /d3-delaunay@6.0.4: + resolution: {integrity: sha512-mdjtIZ1XLAM8bm/hx3WwjfHt6Sggek7qH043O8KEjDXN40xi3vx/6pYSVTwLjEgiXQTbvaouWKynLBiUZ6SK6A==} engines: {node: '>=12'} dependencies: delaunator: 5.0.0 @@ -7730,7 +7722,7 @@ packages: resolution: {integrity: sha512-Wt23xBych5tSy9IYAM1FR2rWIBFWa52B/oF/GYe5zbdHrg08FU8+BuI6X4PvTwPDdqdAdq04fuWJpELtsaEjeA==} engines: {node: '>=12'} dependencies: - d3-array: 3.2.0 + d3-array: 3.2.4 dev: false /d3-hierarchy@3.1.2: @@ -7745,12 +7737,8 @@ packages: d3-color: 3.1.0 dev: false - /d3-path@1.0.9: - resolution: {integrity: sha512-VLaYcn81dtHVTjEHd8B+pbe9yHWpXKZUC87PzoFmsFrJqgFwDe/qxfp5MlfsfM1V5E/iVt0MmEbWQ7FVIXh/bg==} - dev: false - - /d3-path@3.0.1: - resolution: {integrity: sha512-gq6gZom9AFZby0YLduxT1qmrp4xpBA1YZr19OI717WIdKE2OM5ETq5qrHLb301IgxhLwcuxvGZVLeeWc/k1I6w==} + /d3-path@3.1.0: + resolution: {integrity: sha512-p3KP5HCf/bvjBSSKuXid6Zqijx7wIfNW+J/maPs+iwR35at5JCbLUT0LzF1cnjbCHWhqzQTIN2Jpe8pRebIEFQ==} engines: {node: '>=12'} dev: false @@ -7772,8 +7760,8 @@ packages: /d3-sankey@0.12.3: resolution: {integrity: sha512-nQhsBRmM19Ax5xEIPLMY9ZmJ/cDvd1BG3UVvt5h3WRxKg5zGRbvnteTyWAbzeSvlh3tW7ZEmq4VwR5mB3tutmQ==} dependencies: - d3-array: 2.12.1 - d3-shape: 1.3.7 + d3-array: 3.2.4 + d3-shape: 3.2.0 dev: false /d3-scale-chromatic@3.0.0: @@ -7788,7 +7776,7 @@ packages: resolution: {integrity: sha512-GZW464g1SH7ag3Y7hXjf8RoUuAFIqklOAq3MRl4OaWabTFJY9PN/E1YklhXLh+OQ3fM9yS2nOkCoS+WLZ6kvxQ==} engines: {node: '>=12'} dependencies: - d3-array: 3.2.0 + d3-array: 3.2.4 d3-format: 3.1.0 d3-interpolate: 3.0.1 d3-time: 3.0.0 @@ -7800,17 +7788,11 @@ packages: engines: {node: '>=12'} dev: false - /d3-shape@1.3.7: - resolution: {integrity: sha512-EUkvKjqPFUAZyOlhY5gzCxCeI0Aep04LwIRpsZ/mLFelJiUfnK56jo5JMDSE7yyP2kLSb6LtF+S5chMk7uqPqw==} - dependencies: - d3-path: 1.0.9 - dev: false - - /d3-shape@3.1.0: - resolution: {integrity: sha512-tGDh1Muf8kWjEDT/LswZJ8WF85yDZLvVJpYU9Nq+8+yW1Z5enxrmXOhTArlkaElU+CTn0OTVNli+/i+HP45QEQ==} + /d3-shape@3.2.0: + resolution: {integrity: sha512-SaLBuwGm3MOViRq2ABk3eLoxwZELpH6zhl3FbAoJ7Vm1gofKx6El1Ib5z23NUEhF9AsGl7y+dzLe5Cw2AArGTA==} engines: {node: '>=12'} dependencies: - d3-path: 3.0.1 + d3-path: 3.1.0 dev: false /d3-time-format@4.1.0: @@ -7824,7 +7806,7 @@ packages: resolution: {integrity: sha512-zmV3lRnlaLI08y9IMRXSDshQb5Nj77smnfpnd2LrBa/2K281Jijactokeak14QacHs/kKq0AQ121nidNYlarbQ==} engines: {node: '>=12'} dependencies: - d3-array: 3.2.0 + d3-array: 3.2.4 dev: false /d3-timer@3.0.1: @@ -7857,17 +7839,17 @@ packages: d3-transition: 3.0.1(d3-selection@3.0.0) dev: false - /d3@7.8.2: - resolution: {integrity: sha512-WXty7qOGSHb7HR7CfOzwN1Gw04MUOzN8qh9ZUsvwycIMb4DYMpY9xczZ6jUorGtO6bR9BPMPaueIKwiDxu9uiQ==} + /d3@7.8.5: + resolution: {integrity: sha512-JgoahDG51ncUfJu6wX/1vWQEqOflgXyl4MaHqlcSruTez7yhaRKR9i8VjjcQGeS2en/jnFivXuaIMnseMMt0XA==} engines: {node: '>=12'} dependencies: - d3-array: 3.2.0 + d3-array: 3.2.4 d3-axis: 3.0.0 d3-brush: 3.0.0 d3-chord: 3.0.1 d3-color: 3.1.0 - d3-contour: 4.0.0 - d3-delaunay: 6.0.2 + d3-contour: 4.0.2 + d3-delaunay: 6.0.4 d3-dispatch: 3.0.1 d3-drag: 3.0.0 d3-dsv: 3.0.1 @@ -7878,14 +7860,14 @@ packages: d3-geo: 3.0.1 d3-hierarchy: 3.1.2 d3-interpolate: 3.0.1 - d3-path: 3.0.1 + d3-path: 3.1.0 d3-polygon: 3.0.1 d3-quadtree: 3.0.1 d3-random: 3.0.1 d3-scale: 4.0.2 d3-scale-chromatic: 3.0.0 d3-selection: 3.0.0 - d3-shape: 3.1.0 + d3-shape: 3.2.0 d3-time: 3.0.0 d3-time-format: 4.1.0 d3-timer: 3.0.1 @@ -7903,7 +7885,7 @@ packages: /dagre-d3-es@7.0.10: resolution: {integrity: sha512-qTCQmEhcynucuaZgY5/+ti3X/rnszKZhEQH/ZdWdtP1tA/y3VoHJzcVrO9pjjJCNpigfscAtoUB5ONcd2wNn0A==} dependencies: - d3: 7.8.2 + d3: 7.8.5 lodash-es: 4.17.21 dev: false @@ -10156,10 +10138,6 @@ packages: side-channel: 1.0.4 dev: true - /internmap@1.0.1: - resolution: {integrity: sha512-lDB5YccMydFBtasVtxnZ3MRBHuaoE8GKsppq+EchKL2U4nK/DmEpPHNH8MZe5HkMtpSiTSOZwfN0tzYjO/lJEw==} - dev: false - /internmap@2.0.3: resolution: {integrity: sha512-5Hh7Y1wQbvY5ooGgPbDaL5iYLAPzMTUrjMulskHLH6wnv/A+1q5rgEaiuqEjB+oxGXIVZs1FF+R/KPN3ZSQYYg==} engines: {node: '>=12'}