diff --git a/package.json b/package.json index d6338dd12..2d810a7cd 100644 --- a/package.json +++ b/package.json @@ -49,9 +49,9 @@ "@braintree/sanitize-url": "^3.1.0", "crypto-random-string": "^3.0.1", "d3": "^5.7.0", - "dagre-d3-renderer": "^0.5.8", - "dagre-layout": "^0.8.8", - "graphlibrary": "^2.2.0", + "dagre-d3": "dagrejs/dagre-d3", + "dagre": "^0.8.4", + "graphlib": "^2.1.7", "he": "^1.2.0", "lodash": "^4.17.11", "minify": "^4.1.1", diff --git a/src/diagrams/class/classRenderer.js b/src/diagrams/class/classRenderer.js index 8d382f97d..0b20993a0 100644 --- a/src/diagrams/class/classRenderer.js +++ b/src/diagrams/class/classRenderer.js @@ -1,6 +1,6 @@ import * as d3 from 'd3'; -import dagre from 'dagre-layout'; -import graphlib from 'graphlibrary'; +import dagre from 'dagre'; +import graphlib from 'graphlib'; import { logger } from '../../logger'; import classDb from './classDb'; import utils from '../../utils'; diff --git a/src/diagrams/flowchart/flowChartShapes.js b/src/diagrams/flowchart/flowChartShapes.js index e9b17ae89..ed69c4801 100644 --- a/src/diagrams/flowchart/flowChartShapes.js +++ b/src/diagrams/flowchart/flowChartShapes.js @@ -1,4 +1,4 @@ -import dagreD3 from 'dagre-d3-renderer'; +import dagreD3 from 'dagre-d3'; function question(parent, bbox, node) { const w = bbox.width; diff --git a/src/diagrams/flowchart/flowRenderer.js b/src/diagrams/flowchart/flowRenderer.js index 0e704275f..f290beeeb 100644 --- a/src/diagrams/flowchart/flowRenderer.js +++ b/src/diagrams/flowchart/flowRenderer.js @@ -1,11 +1,11 @@ -import graphlib from 'graphlibrary'; +import graphlib from 'graphlib'; import * as d3 from 'd3'; import flowDb from './flowDb'; import flow from './parser/flow'; import { getConfig } from '../../config'; -import dagreD3 from 'dagre-d3-renderer'; -import addHtmlLabel from 'dagre-d3-renderer/lib/label/add-html-label.js'; +import dagreD3 from 'dagre-d3'; +import addHtmlLabel from 'dagre-d3/lib/label/add-html-label.js'; import { logger } from '../../logger'; import { interpolateToCurve } from '../../utils'; import flowChartShapes from './flowChartShapes'; diff --git a/src/diagrams/state/stateRenderer.js b/src/diagrams/state/stateRenderer.js index 437f336ae..b159d6ef8 100644 --- a/src/diagrams/state/stateRenderer.js +++ b/src/diagrams/state/stateRenderer.js @@ -1,6 +1,6 @@ import * as d3 from 'd3'; -import dagre from 'dagre-layout'; -import graphlib from 'graphlibrary'; +import dagre from 'dagre'; +import graphlib from 'graphlib'; import { logger } from '../../logger'; import stateDb from './stateDb'; import { parser } from './parser/stateDiagram'; diff --git a/yarn.lock b/yarn.lock index bd0b28da5..4eed7d7d0 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3319,7 +3319,7 @@ d3-zoom@1: d3-selection "1" d3-transition "1" -d3@^5.7.0: +d3@^5.12, d3@^5.7.0: version "5.12.0" resolved "https://registry.yarnpkg.com/d3/-/d3-5.12.0.tgz#0ddeac879c28c882317cd439b495290acd59ab61" integrity sha512-flYVMoVuhPFHd9zVCe2BxIszUWqBcd5fvQGMNRmSiBrgdnh6Vlruh60RJQTouAK9xPbOB0plxMvBm4MoyODXNg== @@ -3356,21 +3356,22 @@ d3@^5.7.0: d3-voronoi "1" d3-zoom "1" -dagre-d3-renderer@^0.5.8: - version "0.5.8" - resolved "https://registry.yarnpkg.com/dagre-d3-renderer/-/dagre-d3-renderer-0.5.8.tgz#aa071bb71d3c4d67426925906f3f6ddead49c1a3" - integrity sha512-XH2a86isUHRxzIYbjQVEuZtJnWEufb64H5DuXIUmn8esuB40jgLEbUUclulWOW62/ZoXlj2ZDyL8SJ+YRxs+jQ== +dagre-d3@dagrejs/dagre-d3: + version "0.6.4-pre" + resolved "https://codeload.github.com/dagrejs/dagre-d3/tar.gz/e1a00e5cb518f5d2304a35647e024f31d178e55b" dependencies: - dagre-layout "^0.8.8" - lodash "^4.17.5" + d3 "^5.12" + dagre "^0.8.4" + graphlib "^2.1.7" + lodash "^4.17.15" -dagre-layout@^0.8.8: - version "0.8.8" - resolved "https://registry.yarnpkg.com/dagre-layout/-/dagre-layout-0.8.8.tgz#9b6792f24229f402441c14162c1049e3f261f6d9" - integrity sha512-ZNV15T9za7X+fV8Z07IZquUKugCxm5owoiPPxfEx6OJRD331nkiIaF3vSt0JEY5FkrY0KfRQxcpQ3SpXB7pLPQ== +dagre@^0.8.4: + version "0.8.4" + resolved "https://registry.yarnpkg.com/dagre/-/dagre-0.8.4.tgz#26b9fb8f7bdc60c6110a0458c375261836786061" + integrity sha512-Dj0csFDrWYKdavwROb9FccHfTC4fJbyF/oJdL9LNZJ8WUvl968P6PAKEriGqfbdArVJEmmfA+UyumgWEwcHU6A== dependencies: - graphlibrary "^2.2.0" - lodash "^4.17.5" + graphlib "^2.1.7" + lodash "^4.17.4" dashdash@^1.12.0: version "1.14.1" @@ -5132,10 +5133,10 @@ graceful-fs@^4.0.0, graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2 resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.2.tgz#6f0952605d0140c1cfdb138ed005775b92d67b02" integrity sha512-IItsdsea19BoLC7ELy13q1iJFNmd7ofZH5+X/pJr90/nRoPEX0DJo1dHDbgtYWOhJhcCgMDTOw84RZ72q6lB+Q== -graphlibrary@^2.2.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/graphlibrary/-/graphlibrary-2.2.0.tgz#017a14899775228dec4497a39babfdd6bf56eac6" - integrity sha512-XTcvT55L8u4MBZrM37zXoUxsgxs/7sow7YSygd9CIwfWTVO8RVu7AYXhhCiTuFEf+APKgx6Jk4SuQbYR0vYKmQ== +graphlib@^2.1.7: + version "2.1.7" + resolved "https://registry.yarnpkg.com/graphlib/-/graphlib-2.1.7.tgz#b6a69f9f44bd9de3963ce6804a2fc9e73d86aecc" + integrity sha512-TyI9jIy2J4j0qgPmOOrHTCtpPqJGN/aurBwc6ZT+bRii+di1I+Wv3obRhVrmBEXet+qkMaEX67dXrwsd3QQM6w== dependencies: lodash "^4.17.5" @@ -7044,7 +7045,7 @@ lodash@4.17.11: resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.11.tgz#b39ea6229ef607ecd89e2c8df12536891cac9b8d" integrity sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg== -lodash@^4.0.0, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.12, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.4, lodash@^4.17.5, lodash@~4.17.10: +lodash@^4.0.0, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.12, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.4, lodash@^4.17.5, lodash@~4.17.10: version "4.17.15" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548" integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==