diff --git a/src/d3.js b/src/d3.js deleted file mode 100644 index c414e88f2..000000000 --- a/src/d3.js +++ /dev/null @@ -1,6 +0,0 @@ -import * as d3 from 'd3' -import { textwrap } from 'd3-textwrap' - -d3.textwrap = textwrap - -export default d3 diff --git a/src/diagrams/classDiagram/classRenderer.js b/src/diagrams/classDiagram/classRenderer.js index 27e56b52f..bdfe8f3d5 100644 --- a/src/diagrams/classDiagram/classRenderer.js +++ b/src/diagrams/classDiagram/classRenderer.js @@ -1,9 +1,8 @@ - import dagre from 'dagre-layout' import graphlib from 'graphlibrary' +import * as d3 from 'd3' import classDb from './classDb' -import d3 from '../../d3' import { logger } from '../../logger' import { parser } from './parser/classDiagram' diff --git a/src/diagrams/example/exampleRenderer.js b/src/diagrams/example/exampleRenderer.js index f267c8384..34e623dd1 100644 --- a/src/diagrams/example/exampleRenderer.js +++ b/src/diagrams/example/exampleRenderer.js @@ -1,7 +1,7 @@ +import * as d3 from 'd3' + import db from './exampleDb' import exampleParser from './parser/example.js' -import d3 from '../../d3' - import { logger } from '../../logger' /** diff --git a/src/diagrams/flowchart/flowRenderer.js b/src/diagrams/flowchart/flowRenderer.js index 381ec4516..caef0f609 100644 --- a/src/diagrams/flowchart/flowRenderer.js +++ b/src/diagrams/flowchart/flowRenderer.js @@ -1,9 +1,9 @@ import graphlib from 'graphlibrary' +import * as d3 from 'd3' import graphDb from './graphDb' import flow from './parser/flow' import dot from './parser/dot' -import d3 from '../../d3' import dagreD3 from 'dagre-d3-renderer' import { logger } from '../../logger' diff --git a/src/diagrams/flowchart/graphDb.js b/src/diagrams/flowchart/graphDb.js index a9c950090..ecce367d2 100644 --- a/src/diagrams/flowchart/graphDb.js +++ b/src/diagrams/flowchart/graphDb.js @@ -1,6 +1,7 @@ +import * as d3 from 'd3' + import { logger } from '../../logger' import utils from '../../utils' -import d3 from '../../d3' let vertices = {} let edges = [] diff --git a/src/diagrams/gantt/ganttRenderer.js b/src/diagrams/gantt/ganttRenderer.js index c5c6f9950..617af145e 100644 --- a/src/diagrams/gantt/ganttRenderer.js +++ b/src/diagrams/gantt/ganttRenderer.js @@ -1,8 +1,8 @@ import moment from 'moment' +import * as d3 from 'd3' import { parser } from './parser/gantt' import ganttDb from './ganttDb' -import d3 from '../../d3' import { logger } from '../../logger' parser.yy = ganttDb diff --git a/src/diagrams/gitGraph/gitGraphRenderer.js b/src/diagrams/gitGraph/gitGraphRenderer.js index 930e6ee8d..06fd5b673 100644 --- a/src/diagrams/gitGraph/gitGraphRenderer.js +++ b/src/diagrams/gitGraph/gitGraphRenderer.js @@ -1,8 +1,8 @@ import _ from 'lodash' +import * as d3 from 'd3' import db from './gitGraphAst' import gitGraphParser from './parser/gitGraph' -import d3 from '../../d3' import { logger } from '../../logger' let allCommitsDict = {} diff --git a/src/diagrams/sequenceDiagram/sequenceDiagram.spec.js b/src/diagrams/sequenceDiagram/sequenceDiagram.spec.js index 8bb22acde..04ba2bbee 100644 --- a/src/diagrams/sequenceDiagram/sequenceDiagram.spec.js +++ b/src/diagrams/sequenceDiagram/sequenceDiagram.spec.js @@ -15,7 +15,7 @@ const d3 = { } const renderer = MyModuleInjector({ - '../../d3': d3 + 'd3': d3 }) function addConf (conf, key, value) { diff --git a/src/diagrams/sequenceDiagram/sequenceRenderer.js b/src/diagrams/sequenceDiagram/sequenceRenderer.js index 6b51f2a15..47200dc7c 100644 --- a/src/diagrams/sequenceDiagram/sequenceRenderer.js +++ b/src/diagrams/sequenceDiagram/sequenceRenderer.js @@ -1,6 +1,7 @@ +import * as d3 from 'd3' + import svgDraw from './svgDraw' import { logger } from '../../logger' -import d3 from '../../d3' import { parser } from './parser/sequenceDiagram' import sequenceDb from './sequenceDb' diff --git a/src/mermaidAPI.js b/src/mermaidAPI.js index 5e787ae7f..6fa688df5 100644 --- a/src/mermaidAPI.js +++ b/src/mermaidAPI.js @@ -11,6 +11,8 @@ * returns a svg element for the graph. It is is then up to the user of the API to make use of the svg, either insert it * somewhere in the page or something completely different. */ +import * as d3 from 'd3' + import { logger, setLogLevel } from './logger' import graph from './diagrams/flowchart/graphDb' import utils from './utils' @@ -32,7 +34,6 @@ import classDb from './diagrams/classDiagram/classDb' import gitGraphParser from './diagrams/gitGraph/parser/gitGraph' import gitGraphRenderer from './diagrams/gitGraph/gitGraphRenderer' import gitGraphAst from './diagrams/gitGraph/gitGraphAst' -import d3 from './d3' import pkg from '../package.json' import darkTheme from './less/dark/mermaid.less'