Commit Graph

1541 Commits

Author SHA1 Message Date
Per Brolin 9bb0ed2040 Added registerExternalDiagram for Mindmap 2022-11-09 15:54:39 +01:00
Sidharth Vinod ecc51d7cb8
fix: Remove registerDiagram export 2022-11-09 11:27:36 +05:30
Sidharth Vinod c309e3e3d6
Merge branch 'sidv/fixLL' of https://github.com/mermaid-js/mermaid into sidv/fixLL
* 'sidv/fixLL' of https://github.com/mermaid-js/mermaid:
  Apply suggestions from code review
2022-11-09 09:55:09 +05:30
Sidharth Vinod f52df3037f
fix versions 2022-11-09 09:55:05 +05:30
Sidharth Vinod 649ab17806
feat: Add config validator MVP 2022-11-09 09:54:52 +05:30
Sidharth Vinod 89da6ea31a
Apply suggestions from code review
Co-authored-by: Alois Klink <alois@aloisklink.com>
2022-11-09 09:54:06 +05:30
Sidharth Vinod c7f7ff39ce
fix: Import path in viewer.js 2022-11-09 00:43:19 +05:30
Sidharth Vinod 6d2552ea6e
fix: Filenames 2022-11-08 19:26:02 +05:30
Sidharth Vinod 20b4358c0e
fix: Make options in registerExternalDiagrams optional 2022-11-08 19:21:49 +05:30
Sidharth Vinod 7ca525622b
fix #3757 : Remove dynamic imports for lazy load. 2022-11-08 19:12:37 +05:30
Sebastian Spier 6543ece92c Fix display label/path for explaining where the docs are located 2022-11-08 13:53:18 +01:00
Sidharth Vinod aab8f9273f
Merge branch 'feat/3701-expose-registerDiagram' into sidv/fixLL
* feat/3701-expose-registerDiagram:
  feat: add `mermaidAPI.registerDiagram()`
  refactor(mermaid): remove registerDiagram cb func
  fix(mermaid): fix DiagramDefinition types
2022-11-08 13:50:54 +05:30
Sebastian Spier 013ff182c9 Run Prettier 2022-11-07 20:35:00 +01:00
Sebastian Spier b5d335711f Fixing link to d3 time formatting 2022-11-07 20:23:24 +01:00
Sebastian Spier 5e41b68a3a Remove link to chrome web store app that doesn't exist any more 2022-11-07 17:46:26 +01:00
Sebastian Spier 3b901c4459 More consistent linking: Use the full filename README.md (in config/setup) 2022-11-07 17:00:54 +01:00
Sidharth Vinod 0d8f09cec5
Merge pull request #3755 from mermaid-js/sidv/docsDev
Live edits for Docs
2022-11-07 21:22:25 +05:30
Sebastian Spier 4a45112344 Replace links to '_sidebar.md' with '.vitepress/config.ts' 2022-11-07 10:43:46 +01:00
Sidharth Vinod 2243af1871
Merge pull request #3767 from aloisklink/fix/convert-package-back-to-commonjs
[9.2] fix(mermaid): default mermaid back to CommonJS
2022-11-07 14:31:45 +05:30
Sidharth Vinod 91bbab9e2d
Lint 2022-11-07 14:30:20 +05:30
Sidharth Vinod c6287b640d
Merge remote-tracking branch 'origin/develop' into sidv/docsDev
* origin/develop:
  chore(deps): update all non-major dependencies
  chore(deps): update all non-major dependencies
  docs: Fix relative links to documentation files
  docs: Update references to default config in directives page
  Fixing applitools batches
  chore: Sync docs
  Fix link to CSS classes
2022-11-07 14:11:06 +05:30
Knut Sveidqvist c5fe23c26f
Merge pull request #3753 from mermaid-js/sidv/cspell
Fix CSpell
2022-11-07 09:40:23 +01:00
renovate[bot] 603b537ee1 chore(deps): update all non-major dependencies 2022-11-07 07:48:40 +00:00
renovate[bot] 2a45d71efd chore(deps): update all non-major dependencies 2022-11-07 05:36:39 +00:00
Alois Klink 1a5e7315c0 fix(mermaid): default mermaid back to CommonJS
Default mermaid back to being a CommonJS module.

Improrting Mermaid as CommonJS (e.g. using `require("mermaid")`)
is normally broken (since v8), due to it's dependency on d3,
which is now ESM only.

However, it looks like some software
(e.g. TypeScript, in the docusaurus project)
could still handle the CommonJS version of Mermaid.

This commit now means that older versions of Node/build-tools
should now default to using the CommonJS version of Mermaid.

Newer tools should still see that the `"module"` field points to ESM,
or use the `exports["."]["import"]` field to load ESM.
2022-11-06 23:41:09 +00:00
Alois Klink da6bb9498a fix(mermaid): fix mermaid.render types
The cb param of mermaid.render should be optional,
and mermaid.render returns an SVG string instead of `void`.
2022-11-06 22:46:57 +00:00
Sebastian Spier e653d656b3 Fix links that the link checker could not test (for various reasons) 2022-11-06 22:37:47 +01:00
avijit1258 9e3601ae48 comments in states are skipped now 2022-11-06 01:50:29 -07:00
flaura c56854941e docs: Update references to default config in directives page 2022-11-04 12:54:29 -04:00
Per Brolin 1d9fefe7ac Added pie 2022-11-04 12:44:13 +01:00
Sidharth Vinod d4cc366e86
chore: fix lint 2022-11-04 11:46:48 +05:30
Sidharth Vinod da447ae5d0
Merge remote-tracking branch 'origin/develop' into sidv/docsDev
* origin/develop: (24 commits)
  chore: fix cSpell word entry misspelling "mermiad" -> "mermaid" (#3751)
  chore: Remove Security from config
  Add Security Policy
  chore: cSpell
  Update contributors
  chore(docs): Update live editor links
  update user story link
  chore: lint
  feat(gantt): Add option 'tickInterval' for custom tick interval
  Convert attr to classed
  Convert attr to style
  Discussions are now available
  Make colors required
  make setup not required
  Update theme_proposal.yml
  Update syntaxt_proposal.yml
  Update diagram_proposal.yml
  Update bug_report.yml
  Delete question.md
  Create syntaxt_proposal.yml
  ...
2022-11-04 11:29:49 +05:30
Sidharth Vinod e7369acaea
jq -> node 2022-11-04 02:05:50 +05:30
Sidharth Vinod 3ad17b79a6
CSpell format 2022-11-04 01:41:03 +05:30
Hugo van Kemenade 6879a15834
Fix link to CSS classes 2022-11-03 21:48:49 +02:00
Ashley Engelund (weedySeaDragon @ github) 607fe88d43 Merge remote-tracking branch 'MERMAID/develop' into chore/3648-mermaidAPI-render--dry-cleanup-specs
# Conflicts:
#	cSpell.json
2022-11-03 12:15:22 -07:00
Ashley Engelund b63828f88d
chore: fix cSpell word entry misspelling "mermiad" -> "mermaid" (#3751)
* fix misspelled "mermiad" -> 'mermaid' in cSpell.json

* correct misspelled word caught by cspell
2022-11-03 20:03:52 +01:00
Ashley Engelund (weedySeaDragon @ github) 794b642ff8 merge develop into branch. update cSpell.json; run pnpm install 2022-11-03 10:44:04 -07:00
Ashley Engelund (weedySeaDragon @ github) 6d2441dff6 only call getClasses if the diagram renderer supports it 2022-11-01 12:08:59 -07:00
Ashley Engelund (weedySeaDragon @ github) 46ee4e426f fix typo 2022-11-01 10:19:17 -07:00
Ashley Engelund (weedySeaDragon @ github) 469d0f87be merge fix: get classDefs only if diagram is in CLASSDEF_DIAGRAMS 2022-11-01 10:12:48 -07:00
Ashley Engelund (weedySeaDragon @ github) b20602672e use lodash isEmpty instead of method defined in utils 2022-11-01 10:12:08 -07:00
Ashley Engelund (weedySeaDragon @ github) 6563c0292a merge upstream/develop into branch 2022-11-01 09:53:41 -07:00
Sidharth Vinod 86f835cfc8
Merge branch 'develop' into pr/emersonbottero/3678
* develop:
  chore(docs): Update live editor links
  update user story link
  feat(gantt): Add option 'tickInterval' for custom tick interval
  Convert attr to classed
  Convert attr to style
2022-11-01 21:01:58 +05:30
Sidharth Vinod 4699ba3e71
Update contributors 2022-11-01 20:59:35 +05:30
Knut Sveidqvist e78ac9b92a Updated version 2022-11-01 15:27:20 +01:00
Knut Sveidqvist cd9fac78b8
Merge pull request #3722 from CalebUsadi/fix/convert_attr_to_style
Fix/convert attr to style in er graph
2022-11-01 13:55:27 +01:00
Knut Sveidqvist 4c779beda9
Merge pull request #3729 from DarkNami/feature/1598_add_tick_interval
feat(gantt): Add option 'tickInterval' for custom tick interval
2022-11-01 13:50:38 +01:00
Sidharth Vinod 015e22acf8
feat: Add live updates to docs. 2022-11-01 12:04:34 +05:30
Sidharth Vinod 70ec91d0db
docs: Change yarn to pnpm 2022-11-01 10:34:45 +05:30
Sidharth Vinod 61b7033c65
fix: Lint 2022-10-31 22:18:57 +05:30
Sidharth Vinod a9234785ab
chore: Configure typedoc source links 2022-10-31 22:15:07 +05:30
Sidharth Vinod 83fb0f446f
Fix base 2022-10-31 22:02:47 +05:30
Sidharth Vinod f36e0ef941
chore: Add actions deploy 2022-10-31 21:44:09 +05:30
Sidharth Vinod c72bdc83c8
chore: Cleanup lintStaged 2022-10-31 20:30:05 +05:30
Sidharth Vinod 3b7463e5ed
Precommit Test 2022-10-31 20:27:43 +05:30
Sidharth Vinod 1e410de4cd
Precommit Test 2022-10-31 19:54:30 +05:30
Sidharth Vinod d08701e5c4
Precommit Test 2022-10-31 19:52:57 +05:30
Sidharth Vinod 359a570d77
Precommit Test 2022-10-31 19:51:41 +05:30
Sidharth Vinod 24198ed63e
Merge remote-tracking branch 'origin/develop' into pr/emersonbottero/3678
* origin/develop:
  chore(deps): update all non-major dependencies
  chore(deps): update all non-major dependencies
  chore: Update bug report template
2022-10-31 19:43:53 +05:30
renovate[bot] 77782fdbc7 chore(deps): update all non-major dependencies 2022-10-31 12:56:18 +00:00
renovate[bot] a15b228d3f chore(deps): update all non-major dependencies 2022-10-31 06:48:56 +00:00
Sidharth Vinod 450c308e4f
Update packages/mermaid/.lintstagedrc.json
Co-authored-by: Alois Klink <alois@aloisklink.com>
2022-10-31 12:04:01 +05:30
Sidharth Vinod d1e235a08b
chore: Ignore `packages/mermaid/src/docs/config/setup` 2022-10-31 12:01:56 +05:30
Sidharth Vinod 01ac770037
chore: Review comments 2022-10-31 11:57:50 +05:30
Sidharth Vinod a7c9fe77c5
Update packages/mermaid/src/docs.mts
Co-authored-by: Alois Klink <alois@aloisklink.com>
2022-10-31 11:50:03 +05:30
Emerson Bottero f87d1630d1 chore: fix most of aloisklink reviews 2022-10-30 21:22:38 -03:00
Sidharth Vinod fed32607de
chore: Update docs build vitepress command 2022-10-29 01:14:11 +05:30
Sidharth Vinod 8f5fe38212
chore: format blockquote 2022-10-29 00:56:01 +05:30
Sidharth Vinod f3cf6d638d
chore: Add prettier to docs:code 2022-10-29 00:49:18 +05:30
Sidharth Vinod 6e5adbf0ba
Merge remote-tracking branch 'origin/develop' into pr/emersonbottero/3678
* origin/develop:
  fix: relative paths
  Update packages/mermaid/src/docs.mts
  docs: Fix docs path in Contributing.md
  docs: Add link to docs source
2022-10-29 00:46:10 +05:30
Sidharth Vinod 38fb926ea8
Merge pull request #3612 from mermaid-js/sidv/linkDocsSource
docs: Add link to docs source
2022-10-29 00:23:12 +05:30
Sidharth Vinod b0b4cccc96
fix: Team members 2022-10-29 00:16:59 +05:30
Sidharth Vinod 13e5c5ba72
chore: Fix vitepress build 2022-10-28 23:33:57 +05:30
ishuen 81d1dd7465 Remove extra arrow and adjust cross position 2022-10-28 17:01:57 +08:00
Sidharth Vinod b7d24c8325
chore: Fix favicon 2022-10-28 14:28:57 +05:30
Sidharth Vinod d7bf92b39f
fix: Use AST to replace notes & warnings. 2022-10-28 14:13:24 +05:30
Knut Sveidqvist d4c19ffa59 Merge branch 'release/9.2.0' of github.com:mermaid-js/mermaid into release/9.2.0 2022-10-28 09:34:36 +02:00
Sidharth Vinod 6b3892baf1
Merge remote-tracking branch 'origin/develop' into pr/emersonbottero/3678
* origin/develop:
  docs(git): Regenerate
  docs(git): Add a quoted branch name example
  fix(git): Support quoted branch names
  Ensure example code and rendered output are synced
  Fill inheritance arrow with background color
2022-10-28 13:02:52 +05:30
Sidharth Vinod c1529bb7fc
Merge pull request #3726 from gibson042/gh-3725-gitgraph-quoted-branch-names
fix(git): Support quoted branch names
2022-10-28 12:44:03 +05:30
Richard Gibson 6293a583a4
docs(git): Add a quoted branch name example 2022-10-27 23:35:25 -04:00
Emerson Bottero ec5568b943 chore: more revision fixes 2022-10-27 19:58:39 -03:00
Alois Klink 48b1f489fc fix(mermaid): error if lazyLoadedDiagrams fails
Throws and logs a warning if lazyLoadedDiagrams fails to load properly.

Rendering is still performed, even on a lazyLoadedDiagrams failure.
2022-10-27 17:48:21 +01:00
Alois Klink e62dd255bc feat: expose initThrowsErrorsAsync publicly
Expose the function `initThrowsErrorsAsync()` publicly
as `mermaid.initThrowsErrorsAsync()`.

It has the TSDoc `@alpha` and `@deprecated` tags, so people should
be warned that it might be modified in Mermaid v10 or earlier.

Needed for `mermaid-cli` to handle `lazyLoadedDiagrams`.
2022-10-27 17:48:12 +01:00
Alois Klink 13110c4ed9 docs(mermaid): document initThrowsErrorsAsync
Add some basic tsdoc for initThrowsErrorsAsync.
2022-10-27 17:02:50 +01:00
Alois Klink 327fcbf902 fix: lazy load diagrams in initThrowsErrorsAsync
Previously, calling initThrowsErrorsAsync would not
load any of the lazyLoadedDiagrams entries.

Adaptated from reverted commit 4601c90904
2022-10-27 16:50:57 +01:00
Alois Klink 81924f72c8 Revert "Merge branch 'release_9.2.0_buggfixes'"
This reverts commit 1a0309fb87, reversing
changes made to 56a8068a7f.

This is because the PR https://github.com/mermaid-js/mermaid/pull/3702
worked fine on the `develop` and `release_9.2.0_buggfixes` branches,
but had a bunch of git merge conflicts on the `release/9.2.0` branch.
2022-10-27 16:43:09 +01:00
DarkNami 3166f689f9 feat(gantt): Add option 'tickInterval' for custom tick interval
See issue #1598
2022-10-27 16:47:42 +08:00
Ashish Jain 264edddc71
Merge pull request #3543 from vallsv/empty-aroow-for-inheritance
Fill inheritance arrow with background color
2022-10-26 23:13:38 +02:00
Richard Gibson caf95dec86 fix(git): Support quoted branch names
Fixes #3725
2022-10-26 16:58:09 -04:00
Emerson Bottero 289ac52900 fix : CQ 2022-10-26 17:51:54 -03:00
Emerson Bottero 455839c0b9 fix: Merge conflicts 2022-10-26 16:51:22 -03:00
Caleb Usadi a59f49c04f Convert attr to classed 2022-10-26 00:17:20 -04:00
Caleb Usadi 58d692e6f5 Convert attr to style 2022-10-26 00:16:43 -04:00
Emerson Bottero b62873a195 sync last changes 2022-10-25 17:54:07 -03:00
Ashley Engelund (weedySeaDragon @ github) c413119064 merge MERMAID/develop into branch; fix ts/es lint errors 2022-10-25 08:38:57 -07:00
Ashley Engelund (weedySeaDragon @ github) 599d035daf merge MERMAID/develop into branch 2022-10-25 07:42:57 -07:00
Knut Sveidqvist 10ba3b612e
Merge pull request #3719 from CalebUsadi/fix/3711_er_fill_attribute
Change fill attribute to style
2022-10-25 15:01:35 +02:00
Knut Sveidqvist 3dca7d10d5
Merge pull request #3668 from mermaid-js/3659_height_handling
#3659 Adding height when not using maxWidth
2022-10-25 14:48:50 +02:00
Knut Sveidqvist 84628134ed
Merge pull request #3652 from uttk/bug/3651_git_graph_option
fix: Fix useMaxWidth option for git graph
2022-10-25 14:48:18 +02:00
Knut Sveidqvist f4bb978a87
Merge pull request #3649 from DKurilo/feat/3247-statements-aliases
add statement aliases for ER diagram
2022-10-25 14:46:29 +02:00
Knut Sveidqvist 27a68819bc
Merge pull request #3647 from DKurilo/feat/1414-notes-to-class-diagram
add the way to add notes to class diagram
2022-10-25 14:45:03 +02:00
Knut Sveidqvist 427eaebd79
Merge pull request #3636 from maiermic/bug/3263-border_attribute_does_not_work_in_a_certain_writing_style
fix: border attribute does not work in a certain writing style
2022-10-25 14:30:29 +02:00
Knut Sveidqvist 3603cc883c
Merge pull request #3609 from jasmaa/feature/3593_pie_slice_ordering
Order pie chart slices clockwise by order of entries
2022-10-25 14:24:44 +02:00
Caleb Usadi fc24373667 Change fill attribute to style. 2022-10-24 23:41:34 -04:00
Knut Sveidqvist 1a0309fb87 Merge branch 'release_9.2.0_buggfixes'
Conflicts:
	packages/mermaid/src/mermaid.ts
2022-10-24 10:28:27 +02:00
renovate[bot] 728d022f52 chore(deps): update all non-major dependencies 2022-10-24 07:36:58 +00:00
Knut Sveidqvist e793aae0ec
Merge pull request #3702 from aloisklink/fix/initThrowErrors-support-lazyLoadedDiagrams
Support `lazyLoadedDiagrams` when calling `initThrowsErrors`
2022-10-24 08:28:50 +02:00
Alois Klink f41e34e61a feat: add `mermaidAPI.registerDiagram()`
Exposes the registerDiagram() function publically as
`mermaid.mermaidAPI.registerDiagram` so that users can add their
own diagrams at bundle-time.

This is instead of using the lazyLoadedDiagrams config setting.
2022-10-23 16:53:25 +01:00
Alois Klink 89d3d297b7 refactor(mermaid): remove registerDiagram cb func
Remove the callback function parameter from registerDiagram.
Instead, we can just load the callback function from the `injectUtils`
diagram definition, if it exists.
2022-10-23 16:34:18 +01:00
Alois Klink 41249fd064 fix(mermaid): fix DiagramDefinition types
The `injectUtils` function takes the utils as multiple parameters,
not an object.
2022-10-23 14:23:30 +01:00
Sidharth Vinod 22587b9959
Merge pull request #3708 from aloisklink/style/use-eslint-plugin-tsdoc
Use `eslint-plugin-tsdoc` for TypeScript files instead of `eslint-plugin-jsdoc`
2022-10-23 18:16:42 +05:30
Alois Klink 3a2669e634 fix(mermaid): error if lazyLoadedDiagrams fails
Throw an error if lazyLoadedDiagrams fails to load properly.

Rendering is still performed, even on a lazyLoadedDiagrams failure.
2022-10-23 13:19:40 +01:00
Alois Klink 895a5eb78a docs(mermaid): document initThrowsErrors
Add some basic tsdoc for initThrowsErrors
2022-10-23 13:19:33 +01:00
Alois Klink 4601c90904 fix: load lazyLoadedDiagrams in initThrowsErrors
Previously, calling initThrowsErrors would not
load any of the lazyLoadedDiagrams entries.
2022-10-23 13:19:26 +01:00
shuaisguo f788ab54f3 fix typo 2022-10-23 10:34:26 +08:00
Alois Klink 7e5689d0b9 style: fix eslint-plugin-tsdoc linting issues
Mostly, fixing these eslint-plugin-tsdoc style issues involved:
- Moving types from JSDoc to TypeScript types
- Making sure that all `@param paramName - description`
  had both a `-` and a description.

Occasionally, for some functions, if the JSDoc was completely
empty, I just deleted it, since there was no point in keeping it.
2022-10-22 13:30:50 +01:00
Knut Sveidqvist 8ad8d39fe4 Versions for latest rcs 2022-10-20 12:57:29 +02:00
Jeroen Ekkelkamp 52c5ae6d8e ran linter 2022-10-20 09:14:38 +02:00
Emerson Bottero 870cfdc44c docs: transform custom blocks, warning notes jison 2022-10-20 02:13:18 -03:00
Emerson Bottero 4b64775fde docs: small fixes 2022-10-20 00:13:46 -03:00
Jeroen Ekkelkamp 55d2c928ee
Update packages/mermaid/src/dagre-wrapper/mermaid-graphlib.js
Co-authored-by: Sidharth Vinod <sidharthv96@gmail.com>
2022-10-19 21:00:40 +02:00
Jeroen Ekkelkamp 0c4edd332c Ran linter (npm run lint:fix) 2022-10-19 20:06:54 +02:00
Sidharth Vinod f4fa68031e
Merge branch 'develop' into pr/weedySeaDragon/3684
* develop: (21 commits)
  Theme update from release 9.2
  testcode
  Delete dependabot.yml
  changed cspell config in eslint from warn to error
  Update .eslintrc.json
  fix cypress tests for erDiagram, add eslint-plugin-no-only-tests plugin because of this comment: https://github.com/mermaid-js/mermaid/pull/3647#issuecomment-1281163858
  chore: Add CORS to vite dev
  configured 3 more words in cspell.json
  removed eslint-ignore statements
  chore(deps): pin dependencies
  chore(deps): update all non-major dependencies (#3671)
  style(sequence): rename lineStarty to lineStartY
  style: fix @cspell/eslint warnings
  test(gantt): remove incorrect comment
  added words to cspell ignore words list, removed mywords.txt
  update: open graph image
  fix: prettier
  remove id attribute
  feat(issue#3675): added open graph meta tags
  updated eslint config and fixed cspell warnings
  ...
2022-10-19 22:48:57 +05:30
Sidharth Vinod 377b22e82b
fix: Type of DiagramStyleClassDef, general cleanup 2022-10-19 22:31:37 +05:30
Sidharth Vinod 56a8068a7f
fix: Error handling 2022-10-19 20:30:07 +05:30
Sidharth Vinod d17aa6ecdd
Merge branch 'release_9.2.0_buggfixes' into release/9.2.0
* release_9.2.0_buggfixes:
  fix: Add default arg to options
  fix: Build types
  chore: Update creation date
  fix: getElementById type issue.
2022-10-19 19:21:19 +05:30
Sidharth Vinod 5192608f7c
Merge branch 'release_9.2.0_buggfixes' into sidv/TSMindmap
* release_9.2.0_buggfixes:
  fix: Add default arg to options
2022-10-19 19:13:46 +05:30
Sidharth Vinod 77f5e0d5f3
fix: Add default arg to options 2022-10-19 19:13:05 +05:30
Sidharth Vinod 4c311ea4b1
fix: TS errors 2022-10-19 19:03:29 +05:30
Sidharth Vinod bbb3712284
Merge branch 'release_9.2.0_buggfixes' into sidv/TSMindmap
* release_9.2.0_buggfixes:
  Color fix for default nodes in mindmap, line uses inv color
2022-10-19 18:42:13 +05:30
Knut Sveidqvist 4838d63455 Theme update from release 9.2 2022-10-19 14:37:48 +02:00
Knut Sveidqvist 1388e201e5 Adding queue for async calls in mermaidts and fixing icon color 2022-10-19 14:30:36 +02:00
Knut Sveidqvist ea314cd24a Setting version to rc7 2022-10-19 08:01:21 +02:00
Knut Sveidqvist 8230c8f8b4 Merge remote-tracking branch 'origin/release/9.2.0' into release/9.2.0 2022-10-19 07:52:14 +02:00
Knut Sveidqvist d115fbc6da Merge branch 'release_9.2.0_buggfixes' into release/9.2.0 2022-10-19 07:52:05 +02:00
Santosh Viswanatham c71b6e31f7
Merge branch 'develop' into feat/3601-cspell-configuration 2022-10-18 21:02:38 +05:30
Knut Sveidqvist 2ae8bf2987 Color fix for default nodes in mindmap, line uses inv color 2022-10-18 16:04:14 +02:00
Sidharth Vinod 017fc483e7
Merge branch 'develop' of https://github.com/emersonbottero/mermaid into pr/emersonbottero/3678
* 'develop' of https://github.com/emersonbottero/mermaid:
  docs: fix layout problem
  docs: added warning and notes
  docs: added warning and notes
  docs: added warning and notes
  docs: small improvements
2022-10-18 12:29:03 +05:30
Sidharth Vinod f2571e9930
fix: Live editor links 2022-10-18 12:28:48 +05:30
Emerson Bottero 66ea491aff docs: fix layout problem 2022-10-18 00:26:36 -03:00
Emerson Bottero e95eaddf8a docs: added warning and notes 2022-10-18 00:07:14 -03:00
Emerson Bottero d296049d19 docs: added warning and notes 2022-10-18 00:05:27 -03:00
Emerson Bottero c45bf055b6 docs: added warning and notes 2022-10-17 23:58:51 -03:00
Emerson Bottero c8b377bf74 docs: small improvements 2022-10-17 19:32:47 -03:00
Sidharth Vinod f6c167db84
Merge pull request #3679 from danangtomo/feat/3675_added_opengraph_meta
Added Open Graph meta tags
2022-10-17 22:15:35 +05:30
Dima Kurilo d41efa413c add more docs 2022-10-17 09:58:04 -04:00
Dima Kurilo 5803d0abaf update docs 2022-10-17 09:46:10 -04:00
Knut Sveidqvist e86d7894f5 #3680 Add font familiy in a way that does remove other configuration 2022-10-17 10:51:41 +02:00
Knut Sveidqvist 752a6b2cb0 #3687 Separating the render specific data from the data related to parsing 2022-10-17 10:46:46 +02:00
Sidharth Vinod 97a842e651
fix: Build types 2022-10-17 11:45:19 +05:30
devcer 8b64ad971a configured 3 more words in cspell.json 2022-10-17 09:41:59 +05:30
devcer 338e7e83cd removed eslint-ignore statements 2022-10-17 09:33:01 +05:30
devcer fde3964b50 removed eslint-ignore statements 2022-10-17 09:31:58 +05:30
devcer aad53f9e61 merged with master 2022-10-17 09:27:42 +05:30
renovate[bot] 17b72d565d chore(deps): pin dependencies 2022-10-17 03:12:28 +00:00
uttk 319f925bdd fix: Fixed git graph to use global setting if `useMaxWidth` option is not set 2022-10-17 03:07:10 +00:00
renovate[bot] 541de12690
chore(deps): update all non-major dependencies (#3671)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2022-10-16 22:58:11 +02:00
Ashley Engelund (weedySeaDragon @ github) ea86ef3995 change spec descriptions to active voice (= shorter b/c 'should' isn't needed) 2022-10-16 11:14:57 -07:00
Ashley Engelund (weedySeaDragon @ github) fcba29f774 functions and specs: removeExistingElements 2022-10-16 11:08:01 -07:00
Ashley Engelund (weedySeaDragon @ github) 166dca55f2 functions and specs: createUserstyles; minor changes 2022-10-16 09:39:31 -07:00
Alois Klink aa43cfb5ac
style(sequence): rename lineStarty to lineStartY
Fixes @cspell/eslint warnings.
2022-10-16 10:24:36 +01:00
Alois Klink 989d716c36
style: fix @cspell/eslint warnings
Ignores some names of contributors, and adjusts some capitilization
spacing to fix all cspell warnings.
2022-10-16 10:23:23 +01:00
Alois Klink 720849a55e
test(gantt): remove incorrect comment
This comment seems to have been accidentally added 7 years ago
in 6f96b5dd14
2022-10-16 10:01:36 +01:00
Sidharth Vinod c83e29c6e3
chore: Update creation date 2022-10-16 10:11:19 +05:30
Sidharth Vinod a4af3704ba
fix: getElementById type issue.
Converts mindmapDB to TS
2022-10-16 10:06:44 +05:30
Ashley Engelund (weedySeaDragon @ github) a3b8c301e2 functions and specs: createCssStyles, appendDivSvgG,cleanUpSvgCode, putIntoIFrame [for render] 2022-10-15 19:15:59 -07:00
Ashley Engelund (weedySeaDragon @ github) d106d3d1b1 add MockedD3.ts 2022-10-15 19:14:56 -07:00
Ashley Engelund (weedySeaDragon @ github) a26673c59a const isSandboxed, isLooseSecurityLevel, fontFamily; a few more CONSTs 2022-10-15 13:58:24 -07:00
Ashley Engelund (weedySeaDragon @ github) 5aff154740 more meaningful var names; move related lines together; const idSelector 2022-10-15 13:43:40 -07:00
Ashley Engelund (weedySeaDragon @ github) 2e86031f00 comment the main steps (prepare to break into functions that can be tested) 2022-10-15 13:27:15 -07:00
Ashley Engelund (weedySeaDragon @ github) 978bf4e0ff render: define const iFrameId, enclosingDivID and _selector to use in function 2022-10-15 13:19:58 -07:00
Ashley Engelund (weedySeaDragon @ github) 8aaa7b1ba3 specs: encodeEntities, decodeEntities 2022-10-15 13:14:01 -07:00
Ashley Engelund (weedySeaDragon @ github) d248952d9e render: constants 2022-10-15 11:11:54 -07:00
Sidharth Vinod 775fb80c43
Merge branch 'release_9.2.0_buggfixes' into release/9.2.0
* release_9.2.0_buggfixes:
  fix: Remove hardcoded numericLevel
  fix: Diagram load issue
2022-10-15 21:38:34 +05:30
Sidharth Vinod aec1d80966
fix: Remove hardcoded numericLevel 2022-10-15 21:33:09 +05:30
Santosh Viswanatham 1f642ca9b6
Merge branch 'develop' into feat/3601-cspell-configuration 2022-10-15 19:48:08 +05:30
devcer 478c387491 added words to cspell ignore words list, removed mywords.txt 2022-10-15 19:43:07 +05:30
Danang Estutomoaji f532843665 update: open graph image 2022-10-15 17:13:36 +07:00
Danang Estutomoaji 9ba1f7c1f6 fix: prettier 2022-10-15 17:04:12 +07:00
Danang Estutomoaji b78dc246ec remove id attribute 2022-10-15 11:56:50 +07:00
Danang Estutomoaji 9251176f5e feat(issue#3675): added open graph meta tags 2022-10-15 11:48:02 +07:00
Emerson Bottero 0da56a1249 docs: new Documentation 2022-10-15 00:50:57 -03:00
Emerson Bottero cbcf7f8a11 docs: new Documentation 2022-10-15 00:50:11 -03:00
Sidharth Vinod 58a53c0fa8
fix: Diagram load issue 2022-10-15 00:30:02 +05:30
Sidharth Vinod b486177ca7
fix: Diagram load issue 2022-10-15 00:28:21 +05:30
Knut Sveidqvist 957e64fe8a Docs with lazy loading using rc bundles 2022-10-14 16:10:57 +02:00
Knut Sveidqvist 7881d1e457 Merge branch 'release_9.2.0_buggfixes' into release/9.2.0 2022-10-14 15:12:56 +02:00
Knut Sveidqvist 16be835c9b Removing error thrown disrupting rendering 2022-10-14 15:12:22 +02:00
Knut Sveidqvist 59cf085af5 #448 Fix for root nodes without children 2022-10-14 15:11:29 +02:00
Knut Sveidqvist fc8db95597 Release 9.20 fixes of docsify 2022-10-14 15:05:00 +02:00
renovate[bot] 9ac3992fd2
chore(deps): update all non-major dependencies (minor) (#3632)
* chore(deps): update all non-major dependencies

* chore: add `auto-install-peers` to `.npmrc`

* chore: Update lockfile

* Update docs/index.html

Co-authored-by: Matthieu MOREL <matthieu.morel35@gmail.com>

* Update packages/mermaid/src/docs/index.html

Co-authored-by: Matthieu MOREL <matthieu.morel35@gmail.com>

* Define integrity, crossorigin and referrerpolicy

* Define integrity, crossorigin and referrerpolicy

* chore: format

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Sidharth Vinod <sidharthv96@gmail.com>
Co-authored-by: Matthieu MOREL <matthieu.morel35@gmail.com>
2022-10-14 13:18:19 +02:00
Knut Sveidqvist cc10e62ebd Merge branch 'release_9.2.0_buggfixes' into release/9.2.0 2022-10-14 10:03:02 +02:00
Knut Sveidqvist bed95c77a9 Some changes in the docs for mindmap 2022-10-14 10:01:32 +02:00
Sidharth Vinod 069951a748
fix: docs 2022-10-14 13:03:27 +05:30
Sidharth Vinod c913fc8407
Merge pull request #3643 from Some-Dood/refactor-handle-error
feat: make `parseError` function more type-safe
2022-10-14 10:02:23 +05:30
Knut Sveidqvist 4be66554b3 #3659 Adding height when not using maxWidth 2022-10-13 14:26:05 +02:00
Sidharth Vinod d62c2d1e22
fix: relative paths 2022-10-13 13:51:27 +05:30
Sidharth Vinod 30a3a9ee53
Merge branch 'sidv/linkDocsSource' of https://github.com/mermaid-js/mermaid into sidv/linkDocsSource
* 'sidv/linkDocsSource' of https://github.com/mermaid-js/mermaid:
  Update packages/mermaid/src/docs.mts
2022-10-13 13:49:27 +05:30
Sidharth Vinod 0d5664cc9b
Merge branch 'develop' into sidv/linkDocsSource
* develop: (36 commits)
  chore(deps): update actions/setup-node action to v3
  Remove inconsistent and deprecated semicolons
  chore(deps): update actions/checkout action to v3
  docs: Fix initial install step
  docs: Update twitter link
  chore: renovate lint
  Update renovate.json
  chore: Bump node to v18
  chore: Set node v16
  chore: Add volta
  chore(deps): add renovate.json
  Contrbution steps updated
  refactor: use `posix.join()` instead of replacing `\`
  Link added for local setup
  contribution.md updated
  fix: Fix eslint warnings
  fix: docs path in windows
  docs: Add twitter
  docs: Add version to doc index.html
  Update packages/mermaid/src/docs/n00b-gettingStarted.md
  ...
2022-10-13 13:48:36 +05:30
Sidharth Vinod d03fdfdbca
Update packages/mermaid/src/docs.mts
Co-authored-by: Alois Klink <alois@aloisklink.com>
2022-10-13 13:48:00 +05:30
Sidharth Vinod 57b883c7dd
Merge pull request #3605 from arpansaha13/sidv/fixWindowsPath
Fix windows paths for `docs:build`
2022-10-13 12:59:07 +05:30
Iulian Onofrei 353895dceb
Remove inconsistent and deprecated semicolons 2022-10-12 23:01:29 +03:00
Knut Sveidqvist d348f2847c Merge branch 'release_9.2.0_buggfixes' into release/9.2.0 2022-10-12 11:54:22 +02:00
Knut Sveidqvist 4d46ea9801 #3192 Adding link type of the std docs 2022-10-12 11:53:02 +02:00
Knut Sveidqvist eec97d10af #3192 Adding the ability to create invisible links in flowcharts(v2) 2022-10-12 11:48:51 +02:00
Sidharth Vinod 3240f8ae56
feat: loadExternalDiagramsAtStartup 2022-10-12 11:56:39 +05:30
uttk 627ddc0774 fix: Fix useMaxWidth option for git graph 2022-10-12 02:14:56 +00:00
Dima Kurilo 4fc3cc7aff add aliases '0+', '1+' and '1' 2022-10-11 21:57:00 -04:00
Dima Kurilo 3e1b235055 add tests 2022-10-11 19:37:05 -04:00
Dima Kurilo 44706bc32e add statement aliases for ER diagram 2022-10-11 19:02:43 -04:00
Ashley Engelund (weedySeaDragon @ github) 589dd70356 common consts; add consts in stateRenderer-v2 (will esp. make theme usage easier) 2022-10-11 13:03:55 -07:00
Ashley Engelund (weedySeaDragon @ github) 85ba4549fb (minor) add "V2" to top level of v2 diagram spec 2022-10-11 13:02:49 -07:00
devcer adf7702211 updated eslint config and fixed cspell warnings 2022-10-11 22:52:49 +05:30
Ashley Engelund (weedySeaDragon @ github) ba71afcce5 diagram-v2: store results of stateDb.extract(), apply class to state; code cleanup 2022-10-11 10:19:28 -07:00
Ashley Engelund (weedySeaDragon @ github) 3c0727c744 diagram-v2 spec: added tests for labels, composite; fix typos, 2022-10-11 10:16:57 -07:00
Basti Ortiz 7391baae34
fix: ensure that `ParseErrorFunction` type alias is compile-time only 2022-10-12 01:14:09 +08:00
Basti Ortiz 4b31112bcb
fix: apply new types to the Mermaid API 2022-10-12 01:07:17 +08:00
Basti Ortiz 17ff584d15
feat: account for the fact that an error may be a `DetailedError` 2022-10-12 01:06:31 +08:00
Ashley Engelund (weedySeaDragon @ github) 79f4eb2e32 stateDb: methods for classDef, (style) classes; update extract(); code cleanup + DRY 2022-10-11 09:53:45 -07:00
Basti Ortiz e8cd3c0baf
fix: use `ParseErrorFunction` alias for mocks 2022-10-12 00:53:10 +08:00
Basti Ortiz 15f31f9d95
feat: make `parseError` function more type-safe 2022-10-12 00:32:41 +08:00
Ashley Engelund (weedySeaDragon @ github) 370806365f parser: idStatement returns stmt: 'state'...; add classDef, class statements 2022-10-11 08:36:04 -07:00
Ashley Engelund (weedySeaDragon @ github) 7b7db4f60e (minor) API: removed unused flowRenderer import; add comment 2022-10-11 08:33:43 -07:00
Ashley Engelund (weedySeaDragon @ github) 965eae5f45 add spec for stateDB addStyleClass 2022-10-11 08:33:43 -07:00
Ashley Engelund (weedySeaDragon @ github) 56f3fa6495 API: getClasses() with the diagram renderer (not flowchart renderer); add const 2022-10-11 08:33:43 -07:00
Sidharth Vinod 50f44c5cb0
Merge branch 'release/9.2.0' of https://github.com/mermaid-js/mermaid into release/9.2.0
* 'release/9.2.0' of https://github.com/mermaid-js/mermaid:
  #3252 Handling for trailing whitespaces in subgraph titles
2022-10-11 16:17:00 +05:30
Sidharth Vinod cc2f4f779a
feat: Add initializeAsync 2022-10-11 16:16:54 +05:30
Knut Sveidqvist 00ce0fc034 Merge branch 'release_9.2.0_buggfixes' into release/9.2.0 2022-10-11 12:30:38 +02:00
Knut Sveidqvist 551b37f969 #3252 Handling for trailing whitespaces in subgraph titles 2022-10-11 12:29:39 +02:00
Knut Sveidqvist bc5ef5fb7d Fix for async issue in parse, adding parseAsync 2022-10-11 11:20:34 +02:00
Dima Kurilo f05f07e44f add the way to add notes to class diagram 2022-10-10 20:53:09 -04:00
Michael Maier 7e8631dd19 fix: vertex property `props` is overwritten instead of being merged with new value
Fixes #3263
2022-10-10 17:59:29 +02:00
Sidharth Vinod 960ea450e9
fix: Dirty fix for sync render.
Should be reverted for v10
2022-10-10 21:50:59 +08:00
Sidharth Vinod 8ffa7e6334
docs: Update twitter link 2022-10-10 20:47:34 +08:00
Knut Sveidqvist 5060c9f390
Merge pull request #3596 from mermaid-js/sidv/fixImportDoc
docs: Add mermaid version to script URL
2022-10-10 14:11:34 +02:00
Knut Sveidqvist e876c35ef9
Merge pull request #3591 from mermaid-js/sidv/fixDetectDiagram
fix Detect diagram fallback
2022-10-10 13:43:41 +02:00
jasmaa 98f4c2d3ae
Update pie docs to reflect label order change 2022-10-09 22:20:59 -04:00
lemontreejs 2bb0cf17d1 refactor: use `posix.join()` instead of replacing `\` 2022-10-09 21:03:57 +05:30
Sidharth Vinod 238b15df9d
Merge branch 'sidv/noVar' into pr/aryandeelwal/3579
* sidv/noVar: (77 commits)
  fix: Fix eslint warnings
  docs: Fix docs path in Contributing.md
  Fix file name during "dev" script
  docs: Sync
  capitalization fix
  format Setup.md
  format cSpell.json
  format docs YAML
  format cSpell.json
  separate words & ignoreWords
  fix: "skin param"
  ignore the changelog
  Revert "fix: "skin param""
  fix: "skin param"
  fix: "corresponding"
  known terms
  known terms
  fix: "JetBrains"
  known terms
  known terms
  ...
2022-10-09 22:13:36 +08:00
Sidharth Vinod 6e2deb1fa7
fix: Fix eslint warnings 2022-10-09 22:08:32 +08:00
Sidharth Vinod c55add73f6
docs: Add link to docs source 2022-10-09 21:00:02 +08:00
jasmaa 053c966d5f
Order pie chart slices clockwise by order of entries 2022-10-08 16:51:11 -04:00
Valentin Valls 1fa84a30c9 Fill inheritance arrow with background color 2022-10-08 19:05:27 +02:00
lemontreejs 622b441eb0 fix: docs path in windows 2022-10-08 20:06:57 +05:30
Sidharth Vinod 508fbccdb4
docs: Add twitter 2022-10-08 19:20:06 +08:00
Sidharth Vinod ad0cb7ff3c
Merge branch 'sidv/fixImportDoc' of https://github.com/mermaid-js/mermaid into sidv/fixImportDoc
* 'sidv/fixImportDoc' of https://github.com/mermaid-js/mermaid:
  Update packages/mermaid/src/docs/n00b-gettingStarted.md
2022-10-08 19:15:08 +08:00
Sidharth Vinod bc258793ac
docs: Add version to doc index.html 2022-10-08 19:15:01 +08:00
Sidharth Vinod 10d2e0a62f
Update packages/mermaid/src/docs/n00b-gettingStarted.md
Co-authored-by: Alois Klink <alois@aloisklink.com>
2022-10-08 19:13:53 +08:00
Sidharth Vinod 738abc8946
chore: Cleanup 2022-10-08 13:41:04 +08:00
Sidharth Vinod de5ad8644e
fix: Optional detector 2022-10-08 13:38:40 +08:00
Sidharth Vinod 97b39bca95
fix: Remove connectDiagram 2022-10-08 13:22:06 +08:00
Sidharth Vinod 3698b30809
fix: Optimize diagram loading 2022-10-08 13:14:16 +08:00
Sidharth Vinod 069437842b
Merge branch 'develop' into sidv/fixDetectDiagram
* develop: (50 commits)
  docs: Sync
  capitalization fix
  format Setup.md
  format cSpell.json
  format docs YAML
  format cSpell.json
  separate words & ignoreWords
  fix: "skin param"
  ignore the changelog
  Revert "fix: "skin param""
  fix: "skin param"
  fix: "corresponding"
  known terms
  known terms
  fix: "JetBrains"
  known terms
  known terms
  fix: "stable"
  known term
  add known term
  ...
2022-10-08 12:35:40 +08:00
Sidharth Vinod 6f05d4b05a
fix: docs path in windows 2022-10-08 12:16:39 +08:00
Sidharth Vinod ab5111e84f
fix: Remove hard coded Path separator 2022-10-08 12:16:24 +08:00
Sean Killeen 2b40bc0a48 format Setup.md 2022-10-07 21:56:28 -04:00
Sidharth Vinod 6029bdeee9
Merge branch 'develop' into sidv/fixImportDoc
* develop:
  Fix for broken test
  fix: build npm-script
  Fix for issue in classdiagram-v2 from the typescript updates
  fix: build npm-script
  chore: Cleanup
  chore: cleanup
  fix: dynamic import
  fix: module import in pie chart demo
  fix: use async in render-after-error
2022-10-08 09:41:11 +08:00
Sidharth Vinod 0261e7464a
docs: ESM import 2022-10-08 09:40:54 +08:00
Sean Killeen 514d12d48c fix: "skin param" 2022-10-07 21:31:18 -04:00
Sean Killeen 18283bc48f Revert "fix: "skin param""
This reverts commit f31db315b8.
2022-10-07 21:30:36 -04:00
Sean Killeen f31db315b8 fix: "skin param" 2022-10-07 21:30:10 -04:00
Sidharth Vinod 8a2aea219e
docs: ESM import 2022-10-08 09:27:19 +08:00
Sean Killeen 034fe80411 fix: "corresponding" 2022-10-07 21:26:16 -04:00
Sean Killeen 0e61395aa9 fix: "JetBrains" 2022-10-07 21:24:32 -04:00
Sean Killeen b1f3e21d28 fix: "stable" 2022-10-07 21:21:32 -04:00
Sean Killeen 0859f28a14 fix: "different" 2022-10-07 21:20:37 -04:00
Sean Killeen 56b9aab5ce fix: "previous" 2022-10-07 21:20:28 -04:00
Sean Killeen b0ed5e9be2 turn npmjs.org into link 2022-10-07 21:19:33 -04:00
Sean Killeen a1757ba217 standardization: "sanitize" 2022-10-07 21:17:30 -04:00
Sean Killeen 5390c409d0 back-ticks for non-word terms 2022-10-07 21:17:11 -04:00
Sean Killeen 8cf4efc190 fix: "source control" 2022-10-07 21:15:50 -04:00
Sean Killeen 405df09e43 standardization: "behavior" 2022-10-07 21:15:32 -04:00
Sean Killeen 86adf96021 fix: boundaries 2022-10-07 21:13:37 -04:00
Sean Killeen a0c3de568b back-ticks for non-word terms 2022-10-07 21:13:07 -04:00
Sean Killeen c10eb5af79 back-ticks for non-word terms 2022-10-07 21:12:25 -04:00
Sean Killeen 3c4acd2184 back-ticks for non-word terms 2022-10-07 21:11:39 -04:00
Sean Killeen e494e2dc56 Revert "Back-ticks around non-word term"
This reverts commit ab2e727db9.
2022-10-07 21:06:11 -04:00
Sean Killeen ab2e727db9 Back-ticks around non-word term 2022-10-07 21:06:02 -04:00
Knut Sveidqvist 646f76d343 Fix for broken test 2022-10-07 14:36:25 +02:00
Knut Sveidqvist 047e15951a Fix for issue in classdiagram-v2 from the typescript updates 2022-10-07 12:17:35 +02:00
Sidharth Vinod 6fb92f6f3c
fix: Restore conf. 2022-10-07 17:14:33 +08:00
Sidharth Vinod f4a5b80eff
fix: Load all extraDiagrams 2022-10-07 16:57:28 +08:00
Knut Sveidqvist 802407c8ae Merge remote-tracking branch 'origin/develop' into lazy-load-import 2022-10-07 10:46:16 +02:00
Knut Sveidqvist 439274c5ae chore: Cleanup 2022-10-07 10:40:01 +02:00
Sidharth Vinod 2389f4a285
cleanup 2022-10-07 16:33:59 +08:00
Sidharth Vinod cc55a82b64
Merge branch 'develop' into sidv/fixDetectDiagram
* develop:
  chore: cleanup
  fix: dynamic import
  fix: Filename in viewer.js
  fix: pnpm not found
  fix: Import diagram
  Updated logic for diagram loading
  WIP
2022-10-07 16:30:34 +08:00
Sidharth Vinod 1f8fb56409
docs: Add badges 2022-10-07 16:01:33 +08:00
Sidharth Vinod 5865c890b5
docs: Add mermaid version to script URL 2022-10-07 15:52:32 +08:00
Sidharth Vinod acd9a8aefb
Merge branch 'lazy-load-import' into sidv/fixE2E
* lazy-load-import:
  chore: cleanup
  fix: dynamic import
  fix: Filename in viewer.js
  fix: Import diagram
  Updated logic for diagram loading
  WIP
2022-10-07 15:02:47 +08:00
Sidharth Vinod 66bc844cc9
chore: cleanup 2022-10-07 14:53:16 +08:00
Knut Sveidqvist 883d0d5039
Merge pull request #3592 from mermaid-js/lazy-load-import
Lazy load import
2022-10-06 18:19:19 +02:00
Sidharth Vinod 1615c6d9f9
fix #3391: Remove flowchart as fallback for diagram detection. 2022-10-06 19:14:25 +08:00
Sidharth Vinod f3f4672816
Merge branch 'develop' into sidv/fixE2E
* develop:
  Appended Contact Mail of Mermaid
  Added sttributes to CODE OF CONDUCT
  build(test): remove vitest from subpackages
  test: remove `import {it} from "vitest"`
  chore(docs): run `pnpm run docs:build`
  CODE_OF_CONDUCT Uploaded
2022-10-06 17:34:51 +08:00
Sidharth Vinod c919bef70e
fix: Import diagram 2022-10-06 13:47:00 +08:00
Alois Klink 1f39fde230 build(test): remove vitest from subpackages
Removes vitest from all subpackages so that vitest/`pnpm run test`
are only in the root mono-repo.

This is required, because otherwise the root vitest and the subpackage
vitest versions can otherwise be slightly different, which causes
issues when running unit tests:

```Snapshot cannot be used outside of test```

In the future, we may want to consider moving package specific
tests into `packages/*/test`, and instead running these tests
with `pnpm run --recursive`, so that tests are run in each package by
their own version of vitest. This is the way that most projects
do things (e.g. https://github.com/vitest-dev/vitest).
2022-10-06 00:56:54 +01:00
Alois Klink c420224080 test: remove `import {it} from "vitest"`
We're getting a lot of vitest errors that say:
```Error: No test suite found in file```

I think this is because vitest is somehow
importing a different version the it/test function than the globally
inserted functions.

Removing the imports fixes this.
2022-10-06 00:48:50 +01:00
Knut Sveidqvist 0f2e0c2ab4 Updated logic for diagram loading 2022-10-05 22:03:05 +02:00
Knut Sveidqvist c05c98c082 WIP 2022-10-05 13:14:05 +02:00
Sidharth Vinod 42b59a9e35
Merge remote-tracking branch 'upstream/develop' into sidv/fixE2E
* upstream/develop: (33 commits)
  Updated lockfile
  chore(deps-dev): update vite requirement from ^3.0.9 to ^3.1.4
  chore(deps-dev): update typescript requirement from ^4.8.3 to ^4.8.4
  chore(deps-dev): update @vitest/coverage-c8 requirement
  chore(deps-dev): update @typescript-eslint/eslint-plugin requirement
  chore(deps-dev): update esbuild requirement from ^0.15.8 to ^0.15.10
  chore(deps-dev): update @commitlint/config-conventional requirement
  chore(deps-dev): update eslint-plugin-jest requirement
  chore(deps-dev): update @applitools/eyes-cypress requirement
  chore(deps-dev): update jsdom requirement from ^20.0.0 to ^20.0.1
  chore(deps-dev): update vitest requirement from ^0.23.1 to ^0.23.4
  chore(deps-dev): update lint-staged requirement from ^13.0.0 to ^13.0.3
  chore(deps): update @types/node requirement from ^18.7.21 to ^18.8.1
  chore(deps-dev): update @typescript-eslint/parser requirement
  Fix postbuild script
  #3561 Adding cScale0-11 etc and usage of the colors from the mindmap diagram
  Fix for broken test
  Mindmap cleanup
  Using cose-bilkent layout algorithm for mindmaps
  chore(deps-dev): update husky requirement from ^8.0.0 to ^8.0.1
  ...
2022-10-05 14:58:40 +08:00
Sidharth Vinod 74bd576ebc
fix(mermaid): Add await to render in init. 2022-10-05 14:52:04 +08:00
Ashish Jain e4bca33d00
Merge pull request #3562 from mermaid-js/3561_theme_color_scales
3561 theme color scales
2022-10-04 09:48:20 +02:00
Knut Sveidqvist ef91b4fa0e
Merge pull request #3559 from mermaid-js/minmaps
Mindmaps replacing rendering algoritm with cose-bilkent
2022-10-04 08:26:11 +02:00
Knut Sveidqvist bd44957302
Merge pull request #3544 from AndrewL-64/3304_unlabeled_exception
Fixed labelText undefined behavior
2022-10-04 07:25:14 +02:00
Knut Sveidqvist 8ee321fd7b #3561 Adding cScale0-11 etc and usage of the colors from the mindmap diagram 2022-10-03 14:51:13 +02:00
Knut Sveidqvist 05a594a492 Fix for broken test 2022-10-03 11:22:06 +02:00
Knut Sveidqvist 0a2804c641 Mindmap cleanup 2022-10-03 11:08:55 +02:00
Knut Sveidqvist 5079fa93b4 Using cose-bilkent layout algorithm for mindmaps 2022-10-03 10:05:12 +02:00
Knut Sveidqvist 56add0756f Lazy loading fix for example-diagram and mindmaps 2022-10-03 07:01:56 +02:00
Sidharth Vinod 8d9800c727
fix(docs): Test auto commit 2022-10-03 11:57:19 +08:00
Alois Klink feb1d34c1a style(docs): fix prettier issues (extra newline)
Fix prettier issues by running `pnpm run lint:fix`
2022-10-03 02:06:49 +01:00
Andrew Liu a4d1d86d7b Fixed labelText undefined behavior 2022-10-02 14:32:50 -04:00
JM Marcastel ffe956e27b
Corrected theme variables reference table layout
In replacement of #3540 which modified the generated file and not the source file.
2022-10-02 05:31:41 +02:00
Knut Sveidqvist 0dc0de8f1d
Merge pull request #3534 from aloisklink/build/fix-docsbuild-script
Fix `docs:build` and `docs:verify` scripts
2022-09-30 09:06:13 +02:00
Knut Sveidqvist f5dc4d991f
Merge pull request #3535 from aloisklink/docs/replace-yarn-with-pnpm
docs: replace `yarn` with `pnpm` in dev guide
2022-09-30 09:05:29 +02:00
Alois Klink b8eab08119 build(docs): fix `pnpm run docs:{build,verify}`
Our docs script was searching for docs in the src/docs folder,
which no longer exists.

Instead, it should be looking at the packages/mermaid/src/docs folder.
2022-09-29 20:00:15 +01:00
Alois Klink 794b714fac docs: replace `yarn` with `pnpm` in dev guide
With the new mono-repo move (PR #3531), development must
be done with `pnpm`.

Using `memaid` can still be done with `yarn`/`npm` however.
2022-09-29 19:59:02 +01:00
Per Brolin 6ebfbb2f9e Arrow tip aligned to edge of box 2022-09-29 20:37:57 +02:00
Knut Sveidqvist 972d025578 Merge branch 'develop' into 3061_making_a_monorepo 2022-09-29 16:28:57 +02:00
Knut Sveidqvist 766bdde46b Fixed sample test 2022-09-28 17:53:01 +02:00
Knut Sveidqvist f46f8752ca Adding example diagram as a template for a new diagram 2022-09-28 17:49:47 +02:00
Knut Sveidqvist bed9b1bb99 Removed test folder 2022-09-28 17:17:32 +02:00
Knut Sveidqvist be34e6145f Fix for tests 2022-09-28 14:53:16 +02:00
Knut Sveidqvist f60c7fff65 Merge branch 'develop' into 3061_making_a_monorepo 2022-09-28 14:26:07 +02:00
Knut Sveidqvist 982c1b4979 #3061 Lazy loading auto derived path 2022-09-26 14:22:21 +02:00
Knut Sveidqvist a928120bec #3061 Log handing and other fixes, error handling in diagram creation 2022-09-26 10:44:18 +02:00
Knut Sveidqvist ebdec77c88 #3061 Fixing unit tests 2022-09-26 08:47:41 +02:00
Knut Sveidqvist 98ddc95648 Deoupling, inecting mermaid utilities in external diagram 2022-09-26 08:02:12 +02:00
Knut Sveidqvist 9566f51ca8 Commiton issue #3061 Injecting mermaid utilities in registered diagram 2022-09-26 08:01:23 +02:00
Knut Sveidqvist af2b1945a3 Detector registering itself on load 2022-09-23 16:55:30 +02:00
Sidharth Vinod 8dcbe83b0b
fix types for mermaid-mindmap 2022-09-23 17:51:29 +05:30
Sidharth Vinod 53bbf444e5
fix build 2022-09-23 17:39:08 +05:30
Sidharth Vinod 913468a7b5
Merge branch 'sidv/viteVitest' into sidv/3061_monorepo
* sidv/viteVitest:
  fix: Core build
  fix: js-base64
  fix OutputOptions type
  fix: js-base64
  fix: json import, js-base64
  fix: json import
2022-09-23 17:29:35 +05:30
Sidharth Vinod ad49564ab5
vite build 2022-09-23 12:31:24 +05:30
Sidharth Vinod bf25be7cf0
Merge branch 'sidv/viteVitest' into sidv/3061_monorepo
* sidv/viteVitest:
  ts conversion
  cleanup
  remove esbuild
  fix: tests
  chore: Add recommended extensions
  Fix user-journey leaking css
  Add "Debug Current Test File" configuration for VSCode
  Fix unit test coverage
  Use vite for build
  Fix docs
  vite
  vite Server
  Cleanup
  Merge vitest & esbuild
  Merge vitest
  fix jison generation
  Vite
  Vite
2022-09-23 11:31:15 +05:30
Sidharth Vinod 404b718677
Merge branch '3061_making_a_monorepo' into sidv/3061_monorepo
* 3061_making_a_monorepo:
  Fixed paths for dev server
  Use of pnpm for the monorepo
  Use of pnpm for the monorepo
2022-09-23 11:23:38 +05:30
Knut Sveidqvist 0e0a6c0f69 Fixed paths for dev server 2022-09-22 11:28:37 +02:00
Knut Sveidqvist db31f61368 Use of pnpm for the monorepo 2022-09-22 11:12:57 +02:00
Sidharth Vinod ffbae081ff
wip: esbuild Package 2022-09-22 00:02:53 +05:30
Knut Sveidqvist 9b0d4a28ea Temp removaof some hursky rules etc for the build 2022-09-21 12:35:25 +02:00
Knut Sveidqvist 8dd82839cb Relocation of files 2022-09-21 11:03:33 +02:00