GitHub/mermaid
1
0
Fork 0
mirror of https://github.com/mermaid-js/mermaid.git synced 2025-02-04 07:13:25 +08:00
Code Issues Projects Releases Wiki Activity

#1065 Updated dependency of dagre-d3 to unofficial release

Browse Source
This commit is contained in:
Knut Sveidqvist 2019-11-27 19:09:14 +01:00
parent f62c47a757
commit bea2e73b82
5 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
package.json
View File

@ -49,18 +49,18 @@
"@braintree/sanitize-url": "^3.1.0", "@braintree/sanitize-url": "^3.1.0",
"crypto-random-string": "^3.0.1", "crypto-random-string": "^3.0.1",
"d3": "^5.7.0", "d3": "^5.7.0",
"dagre-d3": "dagrejs/dagre-d3", "dagre-d3-unofficial": "0.6.4",
"dagre": "^0.8.4", "dagre": "^0.8.4",
"graphlib": "^2.1.7", "graphlib": "^2.1.7",
"he": "^1.2.0", "he": "^1.2.0",
"lodash": "^4.17.11", "lodash": "^4.17.11",
"minify": "^4.1.1", "minify": "^4.1.1",
"moment-mini": "^2.22.1", "moment-mini": "^2.22.1",
"prettier": "^1.18.2",
"scope-css": "^1.2.1" "scope-css": "^1.2.1"
}, },
"devDependencies": { "devDependencies": {
"documentation": "^12.0.1", "documentation": "^12.0.1",
"prettier": "^1.18.2",
"eslint": "^6.3.0", "eslint": "^6.3.0",
"eslint-config-prettier": "^6.3.0", "eslint-config-prettier": "^6.3.0",
"eslint-plugin-prettier": "^3.1.0", "eslint-plugin-prettier": "^3.1.0",

2
src/diagrams/flowchart/flowChartShapes.js
View File

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

5
src/diagrams/flowchart/flowRenderer.js
View File

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

28
webpack.config.base.js
View File

@ -1,10 +1,10 @@
import path from 'path' import path from 'path';
const amdRule = { const amdRule = {
parser: { parser: {
amd: false // https://github.com/lodash/lodash/issues/3052 amd: false // https://github.com/lodash/lodash/issues/3052
} }
} };
const jisonRule = { const jisonRule = {
test: /\.jison$/, test: /\.jison$/,
@ -14,7 +14,7 @@ const jisonRule = {
'token-stack': true 'token-stack': true
} }
} }
} };
const jsRule = { const jsRule = {
test: /\.js$/, test: /\.js$/,
include: [ include: [
@ -24,16 +24,13 @@ const jsRule = {
use: { use: {
loader: 'babel-loader' loader: 'babel-loader'
} }
} };
const scssRule = { // load scss to string const scssRule = {
// load scss to string
test: /\.scss$/, test: /\.scss$/,
use: [ use: [{ loader: 'css-to-string-loader' }, { loader: 'css-loader' }, { loader: 'sass-loader' }]
{ loader: 'css-to-string-loader' }, };
{ loader: 'css-loader' },
{ loader: 'sass-loader' }
]
}
export const jsConfig = () => { export const jsConfig = () => {
return { return {
@ -43,7 +40,10 @@ export const jsConfig = () => {
mermaid: './src/mermaid.js' mermaid: './src/mermaid.js'
}, },
resolve: { resolve: {
extensions: ['.wasm', '.mjs', '.js', '.json', '.jison'] extensions: ['.wasm', '.mjs', '.js', '.json', '.jison'],
alias: {
'dagre-d3': 'dagre-d3-unofficial'
}
}, },
node: { node: {
fs: 'empty' // jison generated code requires 'fs' fs: 'empty' // jison generated code requires 'fs'
@ -59,5 +59,5 @@ export const jsConfig = () => {
rules: [amdRule, jsRule, scssRule, jisonRule] rules: [amdRule, jsRule, scssRule, jisonRule]
}, },
devtool: 'source-map' devtool: 'source-map'
} };
} };

7
yarn.lock
View File

@ -3641,9 +3641,10 @@ d3@^5.12, d3@^5.7.0:
d3-voronoi "1" d3-voronoi "1"
d3-zoom "1" d3-zoom "1"
dagre-d3@dagrejs/dagre-d3: dagre-d3-unofficial@0.6.4:
version "0.6.4-pre" version "0.6.4"
resolved "https://codeload.github.com/dagrejs/dagre-d3/tar.gz/e1a00e5cb518f5d2304a35647e024f31d178e55b" resolved "https://registry.yarnpkg.com/dagre-d3-unofficial/-/dagre-d3-unofficial-0.6.4.tgz#c3d0c3993e53942b9ab977a98ac980b6e7c620eb"
integrity sha512-xihvMCALDS/X646WyqBSMN1kl7f0K1Urd42EKYgmyISwML1Bep1MCMm+2Q3TIJe6y8TwHKmW6oYXnP5I0J/LIg==
dependencies: dependencies:
d3 "^5.12" d3 "^5.12"
dagre "^0.8.4" dagre "^0.8.4"