From fe0434cb1641bcc80bfbde7757f16439ed039ab6 Mon Sep 17 00:00:00 2001 From: Tyler Long Date: Tue, 12 Sep 2017 23:13:49 +0800 Subject: [PATCH] Release 7.0.17 --- dist/index.html | 2 +- package.json | 6 +++--- src/mermaidAPI.js | 17 ++++++++--------- yarn.lock | 12 +++++++++--- 4 files changed, 21 insertions(+), 16 deletions(-) diff --git a/dist/index.html b/dist/index.html index efb911731..6609d6385 100644 --- a/dist/index.html +++ b/dist/index.html @@ -99,7 +99,7 @@ Class08 <--> C2: Cool label diff --git a/package.json b/package.json index 698e488f2..2e5ed5dcf 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "mermaid", - "version": "7.0.16", + "version": "7.0.17", "description": "Markdownish syntax for generating flowcharts, sequence diagrams, class diagrams, gantt charts and git graphs.", "main": "dist/mermaid.core.js", "keywords": [ @@ -42,7 +42,7 @@ "dependencies": { "chalk": "^2.1.0", "d3": "3.5.17", - "dagre-d3-renderer": "^0.4.23", + "dagre-d3-renderer": "^0.4.24", "dagre-layout": "^0.8.0", "he": "^1.1.1", "lodash": "^4.17.4", @@ -81,7 +81,7 @@ "less-loader": "^4.0.5", "phantomjs-prebuilt": "^2.1.15", "puppeteer": "^0.10.2", - "rimraf": "^2.6.1", + "rimraf": "^2.6.2", "standard": "^10.0.3", "style-loader": "^0.18.2", "webpack": "^3.5.6", diff --git a/src/mermaidAPI.js b/src/mermaidAPI.js index 3d1b75b1f..bd45a3775 100644 --- a/src/mermaidAPI.js +++ b/src/mermaidAPI.js @@ -35,18 +35,17 @@ import gitGraphAst from './diagrams/gitGraph/gitGraphAst' import d3 from './d3' import pkg from '../package.json' -import darkStyle from './less/dark/mermaid.less' -import defaultStyle from './less/default/mermaid.less' -import forestStyle from './less/forest/mermaid.less' -import neutralStyle from './less/neutral/mermaid.less' +import darkTheme from './less/dark/mermaid.less' +import defaultTheme from './less/default/mermaid.less' +import forestTheme from './less/forest/mermaid.less' +import neutralTheme from './less/neutral/mermaid.less' const themes = { - dark: darkStyle, - default: defaultStyle, - forest: forestStyle, - neutral: neutralStyle + dark: darkTheme, + default: defaultTheme, + forest: forestTheme, + neutral: neutralTheme } -const defaultTheme = forestStyle /** * ## Configuration diff --git a/yarn.lock b/yarn.lock index a05eabee9..7641829cf 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1661,9 +1661,9 @@ d@1: dependencies: es5-ext "^0.10.9" -dagre-d3-renderer@^0.4.23: - version "0.4.23" - resolved "https://registry.yarnpkg.com/dagre-d3-renderer/-/dagre-d3-renderer-0.4.23.tgz#c0cddbc9b85409e78f4fb3e6ebc45be3b4d29227" +dagre-d3-renderer@^0.4.24: + version "0.4.24" + resolved "https://registry.yarnpkg.com/dagre-d3-renderer/-/dagre-d3-renderer-0.4.24.tgz#b36ce2fe4ea20de43e7698627c6ede2a9f15ec45" dependencies: d3 "3.5.17" dagre-layout "^0.8.0" @@ -5554,6 +5554,12 @@ rimraf@2, rimraf@^2.2.8, rimraf@^2.5.1, rimraf@^2.6.0, rimraf@^2.6.1: dependencies: glob "^7.0.5" +rimraf@^2.6.2: + version "2.6.2" + resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.2.tgz#2ed8150d24a16ea8651e6d6ef0f47c4158ce7a36" + dependencies: + glob "^7.0.5" + ripemd160@^2.0.0, ripemd160@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/ripemd160/-/ripemd160-2.0.1.tgz#0f4584295c53a3628af7e6d79aca21ce57d1c6e7"