From 87f6d34b4f361c90f99160f436b13c06174c9165 Mon Sep 17 00:00:00 2001 From: Thomas Karner Date: Fri, 2 Sep 2022 23:09:19 +0200 Subject: [PATCH 1/5] added mermerd to integrations documentation --- docs/integrations.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/integrations.md b/docs/integrations.md index ff7c9b30a..0adef0bf3 100644 --- a/docs/integrations.md +++ b/docs/integrations.md @@ -31,6 +31,7 @@ They also serve as proof of concept, for the variety of things that can be built - [redmine-mermaid](https://github.com/styz/redmine_mermaid) - [markdown-for-mermaid-plugin](https://github.com/jamieh-mongolian/markdown-for-mermaid-plugin) - [Jetsbrain IDE eg Pycharm](https://www.jetbrains.com/go/guide/tips/mermaid-js-support-in-markdown/) +- [mermerd](https://github.com/KarnerTh/mermerd) ## CRM/ERP/Similar From 3b571fc9b32ea4057a5d8c780f53d12f1ae51ff8 Mon Sep 17 00:00:00 2001 From: Daniel Bartholomae Date: Sat, 3 Sep 2022 20:33:50 +0200 Subject: [PATCH 2/5] Fix typo in documentation --- src/mermaidAPI.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mermaidAPI.ts b/src/mermaidAPI.ts index 303a78680..70e3b679b 100644 --- a/src/mermaidAPI.ts +++ b/src/mermaidAPI.ts @@ -8,7 +8,7 @@ * The core of this api is the [**render**](Setup.md?id=render) function which, given a graph * definition as text, renders the graph/diagram and returns an 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 + * It is then up to the user of the API to make use of the svg, either insert it somewhere in the * page or do something completely different. * * In addition to the render function, a number of behavioral configuration options are available. From b79eaae0020e15336edbac22d9006321e07d088d Mon Sep 17 00:00:00 2001 From: Daniel Bartholomae Date: Sat, 3 Sep 2022 20:36:14 +0200 Subject: [PATCH 3/5] Fix typo --- src/mermaidAPI.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mermaidAPI.ts b/src/mermaidAPI.ts index 70e3b679b..f44f6743c 100644 --- a/src/mermaidAPI.ts +++ b/src/mermaidAPI.ts @@ -171,7 +171,7 @@ const render = function ( .append('g'); } else { // No container was provided - // If there is an existsing element with the id, we remove it + // If there is an existing element with the id, we remove it // this likely a previously rendered diagram const existingSvg = document.getElementById(id); if (existingSvg) { From 27baa24c827448b08d1da96cd6ddb8a4f022c4f2 Mon Sep 17 00:00:00 2001 From: Daniel Bartholomae Date: Sat, 3 Sep 2022 22:54:43 +0200 Subject: [PATCH 4/5] Build documentation --- docs/Setup.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/Setup.md b/docs/Setup.md index b7ee5e833..bc02f194e 100644 --- a/docs/Setup.md +++ b/docs/Setup.md @@ -11,7 +11,7 @@ using the default integration provided by mermaid.js. The core of this api is the [**render**][2] function which, given a graph definition as text, renders the graph/diagram and returns an 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 +It is then up to the user of the API to make use of the svg, either insert it somewhere in the page or do something completely different. In addition to the render function, a number of behavioral configuration options are available. From 1d84cfe2e2abd15ac373855c2808e4cb466315de Mon Sep 17 00:00:00 2001 From: Alois Klink Date: Sat, 3 Sep 2022 23:01:53 +0100 Subject: [PATCH 5/5] build: run `build:prod` on `yarn prepare` Adds `yarn build:prod` to the `yarn prepare` script. For most package managers (e.g. yarn v1 and NPM), the `prepare` script is called automatically when installing from a local location/git url. It's not called when installing from NPM. This is required because the source code doesn't contain the `dist/mermaid.min.js` file, it has to be built first. Fixes installing mermaid via `git`, e.g.: `yarn add git+https://github.com/mermaid-js/mermaid.git` Fixes: 1549eb20dfbf0698749ab50b2cb264e63d2015b5 --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 1bf1be7ab..431b5785a 100644 --- a/package.json +++ b/package.json @@ -41,7 +41,7 @@ "test": "yarn lint && jest src/.*", "test:watch": "jest --watch src", "prepublishOnly": "yarn build && yarn test", - "prepare": "husky install", + "prepare": "concurrently \"husky install\" \"yarn build:prod\"", "pre-commit": "lint-staged" }, "repository": { @@ -132,4 +132,4 @@ "**/*.css", "**/*.scss" ] -} \ No newline at end of file +}