Merge pull request #1114 from mermaid-js/feature/1112_revert_offical_dagre_d3

Feature/1112 Revert to offical dagre d3

package.json

@@ -49,8 +49,8 @@
     "@braintree/sanitize-url": "^3.1.0",
     "crypto-random-string": "^3.0.1",
     "d3": "^5.7.0",
-    "dagre-d3-unofficial": "0.6.4",
     "dagre": "^0.8.4",
+    "dagre-d3": "^0.6.4",
     "graphlib": "^2.1.7",
     "he": "^1.2.0",
     "lodash": "^4.17.11",
@@ -59,31 +59,31 @@
     "scope-css": "^1.2.1"
   },
   "devDependencies": {
-    "documentation": "^12.0.1",
-    "prettier": "^1.18.2",
-    "eslint": "^6.3.0",
-    "eslint-config-prettier": "^6.3.0",
-    "eslint-plugin-prettier": "^3.1.0",
     "@babel/core": "^7.2.2",
     "@babel/preset-env": "^7.2.0",
     "@babel/register": "^7.0.0",
     "@percy/cypress": "^2.0.1",
     "babel-core": "7.0.0-bridge.0",
-    "babel-jest": "^23.6.0",
+    "babel-jest": "^24.9.0",
     "babel-loader": "^8.0.4",
     "coveralls": "^3.0.2",
     "css-loader": "^2.0.1",
     "css-to-string-loader": "^0.1.3",
     "cypress": "3.4.0",
+    "documentation": "^12.0.1",
+    "eslint": "^6.3.0",
+    "eslint-config-prettier": "^6.3.0",
+    "eslint-plugin-prettier": "^3.1.0",
     "husky": "^1.2.1",
     "identity-obj-proxy": "^3.0.0",
     "jest": "^24.9.0",
     "jison": "^0.4.18",
     "moment": "^2.23.0",
     "node-sass": "^4.12.0",
+    "prettier": "^1.18.2",
     "puppeteer": "^1.17.0",
     "sass-loader": "^7.1.0",
-    "start-server-and-test": "^1.10.0",
+    "start-server-and-test": "^1.10.6",
     "webpack": "^4.27.1",
     "webpack-cli": "^3.1.2",
     "webpack-dev-server": "^3.4.1",

src/diagrams/flowchart/flowChartShapes.js

@@ -1,4 +1,4 @@
-import dagreD3 from 'dagre-d3-unofficial';
+import dagreD3 from 'dagre-d3';
 
 function question(parent, bbox, node) {
   const w = bbox.width;

src/diagrams/flowchart/flowRenderer.js

@@ -6,10 +6,10 @@ import flow from './parser/flow';
 import { getConfig } from '../../config';
 
 const newDagreD3 = true;
-import dagreD3 from 'dagre-d3-unofficial';
+import dagreD3 from 'dagre-d3';
 // const newDagreD3 = false;
 
-import addHtmlLabel from 'dagre-d3-unofficial/lib/label/add-html-label.js';
+import addHtmlLabel from 'dagre-d3/lib/label/add-html-label.js';
 import { logger } from '../../logger';
 import { interpolateToCurve } from '../../utils';
 import flowChartShapes from './flowChartShapes';

webpack.config.base.js

@@ -40,10 +40,7 @@ export const jsConfig = () => {
       mermaid: './src/mermaid.js'
     },
     resolve: {
-      extensions: ['.wasm', '.mjs', '.js', '.json', '.jison'],
-      alias: {
-        'dagre-d3': 'dagre-d3-unofficial'
-      }
+      extensions: ['.wasm', '.mjs', '.js', '.json', '.jison']
     },
     node: {
       fs: 'empty' // jison generated code requires 'fs'