Tom PERRILLAT-COLLOMB
c2ec63d4fd
feat(er): allow leading underscore for attributes name
2023-01-30 12:34:06 +01:00
Emerson Bottero
df10d64989
chore: add moment to dependencies
2023-01-29 11:24:48 -03:00
GavinPen
cb1a20264d
Update mindmap.md
...
Minor Improvement to wording
2023-01-28 17:42:30 +00:00
Emerson Bottero
7179f1bcba
chore: remove moment-mini
2023-01-26 20:55:57 -03:00
ashishj
61f33567ae
Making timeline diagram lazy-loaded internal, removing separate package
2023-01-26 10:29:35 +01:00
Olivier Leveau
9fb6f1998f
Merge branch 'develop' into feature/AddBoxForSeqDiagrams
2023-01-26 09:14:18 +01:00
Emerson Bottero
19e3624e89
fix: moment-mini default exporter
2023-01-26 01:23:41 -03:00
Sidharth Vinod
c51f6df82c
Merge pull request #4030 from tomperr/feature/4009_er_multiple_constraints
...
feat(er): add multiple key constraints
2023-01-26 00:16:58 +05:30
Tom PERRILLAT-COLLOMB
dc0a46f742
test(er): improve tests on multiple key constraints
2023-01-25 19:40:40 +01:00
Sidharth Vinod
c76728b423
Merge pull request #3902 from weedySeaDragon/bug/3858_state_named_state_container
...
Bug/3858 [state] trailing whitespace in ids for named state container
2023-01-25 22:51:34 +05:30
Sidharth Vinod
0aa7da261f
Merge pull request #3962 from aloisklink/build/add-autogenerated-header-after-yaml-codeblocks
...
Add support for YAML frontmatter in Markdown docs (used for Vitepress config)
2023-01-25 22:50:20 +05:30
ashishj
52bd5181f9
More Lint Fixes
2023-01-25 18:03:04 +01:00
ashishj
49ce5222c9
Lint Fixes
2023-01-25 17:49:35 +01:00
ashishj
5c14df0aeb
Added jest test cases
2023-01-25 17:45:47 +01:00
ashishj
8af5c4c341
Fix parser grammer conflicts
2023-01-25 17:44:34 +01:00
Olivier Leveau
f7756ccc00
Fixes Typo, remove console.log
2023-01-25 17:02:10 +01:00
Tom PERRILLAT-COLLOMB
3066a4b43a
doc(er): add documentation on multiple key constraints
2023-01-25 15:13:58 +01:00
Tom PERRILLAT-COLLOMB
26e9b1790b
feat(er): allow multiple constraints on attributes
...
little changes in grammar to get a list of constraints (PK, FK or UK), so little changes in renderer to handle this list
2023-01-24 21:20:11 +01:00
Sidharth Vinod
6792bb94b7
chore: Use logger
2023-01-24 16:11:04 +05:30
Sidharth Vinod
b36e5d0d3b
fix: Remove unnecessary void's.
...
Co-authored-by: Alois Klink <alois@aloisklink.com>
2023-01-24 16:08:43 +05:30
Sidharth Vinod
a28f6bf80c
Merge branch 'develop' into sidv/fixUnhandledPromise
...
* develop:
chore: Skip 57-elk test
Update docs
Update integrations.md
2023-01-24 16:00:35 +05:30
Alois Klink
816f2f512e
build(docs): hide YAML when building for GitHub
...
YAML front-matter is currently only used for Vitepress.
Because of that, to avoid confusion, we can remove this YAML
front-matter when converting the Markdown in packages/mermaid/src/docs
to go into the `docs/` folder for GitHub browsing.
2023-01-22 19:23:57 +00:00
Alois Klink
76c3716b2d
docs: add vitepress metadata to flowchart docs
...
Changes the title in Vitepress, as well as using `outline: "deep"`
for a better outline/table-of-contents for the page.
See https://vitepress.vuejs.org/config/theme-configs#outline
for docs on what `outline: "deep"` does.
2023-01-22 19:21:53 +00:00
Alois Klink
2f1a521db6
build(docs): add auto-generated header after YAML
...
Add the auto-generated header after any YAML front-matter blocks.
YAML front-matter is normally only valid in Markdown when it's at the
beginning of the Markdown file. GitHub/Vitepress may otherwise render
it incorrectly.
2023-01-22 19:21:53 +00:00
Alois Klink
8f4caa4537
refactor(docs): use remark-compatible plugin
...
Change the `transformBlocks` function, which transforms a markdown str,
and instead making it into a
`transformMarkdownAst` function, which transforms a Markdown AST.
This means we can use the remark/unifiedjs plugin infrastructure, see
https://unifiedjs.com/learn/guide/create-a-plugin/
2023-01-22 19:21:51 +00:00
Alois Klink
b26cdb3e46
build(docs): support YAML frontmatter in markdown
...
Vitepress uses YAML frontmatter to configure Vitepress specific
settings, see https://vitepress.vuejs.org/config/frontmatter-configs
We just need to use `remark-frontmatter` to add support for it.
GitHub also renders the YAML front-matter nicely in a table
automatically, but maybe we should instead strip it, if it's only
used by Vitepress?
2023-01-22 19:21:18 +00:00
Knut Sveidqvist
de8928b2d9
#4016 Fix for max_sections in mindmap renderer
2023-01-20 12:48:06 +01:00
pbrolin47
e5b33087f3
Merge pull request #4013 from mermaid-js/4012-handling-rows-wiht-only-spaces
...
Mindmaps: Handling rows with only spaces in them (#4012 )
2023-01-20 10:23:06 +01:00
Knut Sveidqvist
bc56a7d4f1
#4012 Neater grammar for the rows before mindmap
2023-01-20 10:21:13 +01:00
Knut Sveidqvist
80903e427c
#4012 Allowing multiple lines before the mindmap statement
2023-01-20 10:18:26 +01:00
Per Brolin
e8db9b2bd5
Merge branch 'master' of github.com:mermaid-js/mermaid
2023-01-20 09:01:48 +01:00
Knut Sveidqvist
023f2354cd
2023-01-20 08:31:01 +01:00
cnjeftia
96d5bc7695
docs: minor fix on markdown
2023-01-20 11:29:16 +08:00
ashishj
7ef71cc04d
Remove old test cases
2023-01-19 21:05:38 +01:00
Knut Sveidqvist
3cd15cdcf2
#4012 Handling rows with only spaces in them
2023-01-19 20:50:36 +01:00
ashishj
e865368649
Updating version and clean up package.json
2023-01-19 20:42:33 +01:00
ashishj
be818ad57f
Pushing fix for broken themeVariable functionality
2023-01-19 20:30:11 +01:00
ashishj
ca22e85e55
Merge branch 'release/9.4.0' into timeline
2023-01-19 19:20:29 +01:00
ashishj
652a42fe1a
Add directive parsing functionality to timeline diagram
2023-01-19 19:03:05 +01:00
Bastian Ebeling
3aeef7b846
Update integrations.md
...
Corrected `Vs Code` to `VS Code` and inserted `Markdown Preview Enhanced`
2023-01-19 07:15:32 +01:00
Olivier Leveau
250f1f9687
Merge branch 'develop' into feature/AddBoxForSeqDiagrams
2023-01-18 11:35:39 +01:00
Sidharth Vinod
5b9839cbd0
fix package.json
...
add `@types/cytoscape`
2023-01-18 00:53:00 +05:30
Sidharth Vinod
afe3f593e1
fix( #4003 ): Remove unhandled promises
...
Add eslint rules to check for unhandled promises
Fix all existing unhandled promise issues
2023-01-18 00:47:49 +05:30
Sidharth Vinod
8a485c3c88
Merge pull request #3993 from jonabc/bug/sequence-firefox-font-size
...
Parse style string and number font size values from configuration inputs
2023-01-17 22:07:11 +05:30
Jon Ruskin
9629c8d8d6
use undefined not null
2023-01-17 08:31:36 -07:00
Sidharth Vinod
c0f9b3c00b
Merge branch 'develop' into sidv/internalFCV3
...
* develop:
Update docs
docs(sequenceDiagram): subvert prettification of arrow types
2023-01-17 14:07:12 +05:30
Sidharth Vinod
3c12e66f73
Merge pull request #3988 from cakemanny/docs/correct-arrow-type-display
...
docs(sequenceDiagram): subvert prettification of arrow types
2023-01-16 15:18:59 +05:30
renovate[bot]
ea3d7bc594
fix(deps): update dependency dagre-d3-es to v7.0.6
2023-01-16 05:18:31 +00:00
Sidharth Vinod
1c8c69f8db
Merge branch 'sidv/properlyWaitTests' into sidv/internalFCV3
...
* sidv/properlyWaitTests:
feat: Wait for rendering to finish before taking image snapshots
Update docs
chore(deps): update all non-major dependencies
Fix: Too many `primaryBorderColor`
2023-01-16 02:11:59 +05:30
Jon Ruskin
b93ce24c3d
handle string and number font size configurations
2023-01-14 14:05:05 -07:00
Daniel Golding
0a4a3bda16
docs(sequenceDiagram): subvert prettification of arrow types
...
The rendering of the arrows becomes prettified using some sort of font library on mermaid.js.org .
Quote in backticks to indicate these are code.
2023-01-13 17:05:53 +01:00
Howard He
e44e1210e2
Fix: Too many primaryBorderColor
...
Only keep one `primaryBorderColor` field in Theme Variables part.
before:
![before](https://s2.loli.net/2023/01/13/I657QWjsAlVokfE.png )
after:
![after](https://s2.loli.net/2023/01/13/ZQ7PSfcdIKBtGsm.png )
2023-01-13 17:13:56 +08:00
Sidharth Vinod
05d1fc44e8
Merge branch 'develop' into sidv/internalFCV3
...
* develop:
test(sequenceDiagram): mock more d3 curve* types
test(docs): fix test failure due to bad merge
chore(dev-deps): update vitest to `^0.27.1`
2023-01-13 10:23:59 +05:30
Alois Klink
164b9bc2cb
test(sequenceDiagram): mock more d3 curve* types
...
vitest is throwing an error, since these types are used in
packages/mermaid/src/utils.ts, but are not being mocked.
I've added all the curve types I needed to make Vitest happy.
At some point, we may need to improve these mocks, since in d3,
they have the type CurveFactory, not string.
2023-01-13 00:27:48 +00:00
Alois Klink
16540f3005
test(docs): fix test failure due to bad merge
...
Fixes a semantic merge conflict due to the PRs:
- https://github.com/mermaid-js/mermaid/pull/3954
Changed `docs.mts` to use a remark object created by `remark()`
- https://github.com/mermaid-js/mermaid/pull/3946
Added test code that mocked the frozen remark object
(e.g. `remark` not `remark()`).
To fix this issue, we can mock `remark()` so that it always returns
the same remark object, which can then be used the `docs.mts` script,
as well as spied on in the `docs.spec.ts` test file.
Reported-by: Sidharth Vinod <sidharthv96@gmail.com>
2023-01-13 00:17:17 +00:00
Sidharth Vinod
242a508d50
feat: Flowchart-elk integration
2023-01-12 18:26:08 +05:30
Sidharth Vinod
9acd562b9e
Merge pull request #3954 from aloisklink/build/support-GFM-in-markdown-documentation
...
Support GitHub Flavored Markdown in markdown documentation
2023-01-12 12:47:07 +05:30
Sidharth Vinod
3238ee4c2e
Merge pull request #3972 from atmikeguo/develop
...
Fix nonstandard syntax
2023-01-12 12:44:03 +05:30
oleveau
7b5bebd9c4
Sanitize text of the box
2023-01-11 22:10:41 +01:00
Ashish Jain
b67c023b0a
Merge pull request #3938 from mermaid-js/layout-v3-continued
...
Layout v3 continued
2023-01-11 20:01:24 +01:00
Knut Sveidqvist
e28a766e7d
Cleanup, updating the module name and description for flowchart in package.json
2023-01-11 19:56:04 +01:00
Knut Sveidqvist
3f7f04e02f
Adjusted as per @ashishjain0512 review comments
2023-01-11 19:40:25 +01:00
ashishj
68609fd8d0
Merge develop in timeline branch
2023-01-11 18:13:26 +01:00
Knut Sveidqvist
ce6f62e24e
Merge pull request #3946 from weedySeaDragon/chore/3922_doc-diagram-only
...
(chore) Docs: add tag to produce only a diagram, not code example
2023-01-11 18:04:41 +01:00
Knut Sveidqvist
094b97de12
Merge branch 'develop' into layout-v3-continued
2023-01-11 18:03:09 +01:00
Knut Sveidqvist
0e3dadc53c
Updated as per the suggestions from @weedySeaDragon
2023-01-11 17:58:05 +01:00
Knut Sveidqvist
1fca5131c3
Merge pull request #3947 from nekikara/bug/3865_c4_context_border_color
...
Bug/3865 C4Context: $borderColor has no effect
2023-01-11 17:56:00 +01:00
renovate[bot]
a56d0bc36b
fix(deps): update dependency dompurify to v2.4.3
2023-01-09 02:52:02 +00:00
Chidozie Nnachor
568a3329e1
docs: update sequenceDiagram.md to include line break ( #3960 )
...
Included an example for adding a line break to notes. It seems like an issue irking a lot of (new) users
Co-authored-by: Alois Klink <alois@aloisklink.com>
Co-authored-by: Chidozie Nnachor <Chidozie.Nnachor@keylane.com>
2023-01-07 23:39:36 +00:00
atmikeguo
1968d1bb28
Fix nonstandard syntax
2023-01-07 20:05:57 +08:00
Olivier Leveau
117f0ab6da
Fix test / Add Tests
2023-01-06 13:38:03 +01:00
Olivier Leveau
64a935515c
Better color detection + fix win32 path handling
2023-01-06 12:47:09 +01:00
Olivier Leveau
e6befbaa3f
Merge branch 'develop' into feature/AddBoxForSeqDiagrams
2023-01-06 11:06:00 +01:00
Olivier Leveau
e659601e03
Add Box support in Sequence Diagrams
2023-01-05 15:40:40 +01:00
Guilherme Gonzaga
10cb3e26d5
docs: Remove duplicate in ER-diagram documentation
2023-01-03 14:49:20 -04:00
Alois Klink
ef51111b86
build(docs): support GFM in markdown docs
...
Support using GFM in markdown documentation.
GitHub has some custom features in their Markdown documentation.
For example, they support using tables, footnotes, and task lists.
Vitepress supports tables too.
However, remark sometimes throws an error when parsing tables,
so we should use `remark-gfm` to handle them.
2023-01-01 21:28:03 +00:00
Ashley Engelund (weedySeaDragon @ github)
36c0a30c50
Merge remote-tracking branch 'MERMAID/develop' into chore/3922_doc-diagram-only
2022-12-28 12:10:20 -08:00
nekikara
f233ce1fed
add double quote
2022-12-27 20:43:33 +01:00
nekikara
d13c1bce47
fix the way to set stroke and stroke-width properties
2022-12-27 19:49:18 +01:00
Sidharth Vinod
06c357916e
Merge pull request #3943 from nekikara/bug/3876_fix_typo_in_c4_svg-draw
...
fix typos accessing techn property in drawC4Shape function
2022-12-27 10:33:09 +05:30
Ashley Engelund (weedySeaDragon @ github)
78443861a6
test/spec for some of docs.mts
2022-12-26 13:13:47 -08:00
Ashley Engelund (weedySeaDragon @ github)
34aef1a6f5
refactor: transformBlocks(); + MERMAID_DIAGRAM_ONLY behavior; comments, constants
2022-12-26 13:13:02 -08:00
steph
7d0cec0a49
add margin to left and right side of team cards
2022-12-26 12:48:36 -08:00
steph
d8c3f8fc16
updates to the homepage
2022-12-26 12:04:58 -08:00
nekikara
d8aa44f0c5
fix typos accessing techn property in drawC4Shape function
2022-12-24 20:25:59 +01:00
Sidharth Vinod
2c88c6b526
Merge pull request #3921 from tomperr/fix/3795_class_tilde_visibility
...
fix(generic): fix generic type detection
2022-12-24 00:33:39 +05:30
Sidharth Vinod
8ed1ad5a8e
Merge pull request #3907 from huynhicode/docs/formatting
...
docs: fix text overflow
2022-12-24 00:30:31 +05:30
Alois Klink
a58b41a38e
Merge branch 'develop' into fix/3706_support-indented-yaml-only-in-html
2022-12-22 19:24:33 +00:00
Tom PERRILLAT-COLLOMB
df42f96b5a
docs(classDiagram): add nested generic type example in docs
2022-12-22 11:17:44 +01:00
Knut Sveidqvist
c535b10534
Adding info in the docs for enabling elk flowcharts.
2022-12-22 11:00:30 +01:00
Knut Sveidqvist
913ba34386
#815 Adding possibility to configure elk as renderer for flowcharts
2022-12-22 10:33:41 +01:00
steph
dbfb29de27
Merge branch 'develop' into docs/formatting
2022-12-21 14:43:56 -08:00
steph
22b66193dc
update outdate format info formatting
2022-12-21 11:24:48 -08:00
Omer Rosenbaum
895c16a793
Add Swimm to the list of integrations
2022-12-21 10:56:09 +02:00
Steph
b220718b96
Update packages/mermaid/src/docs/syntax/gantt.md
...
Co-authored-by: Alois Klink <alois@aloisklink.com>
2022-12-20 09:37:42 -08:00
Steph
0f337d654f
Update packages/mermaid/src/docs/syntax/gantt.md
...
Co-authored-by: Alois Klink <alois@aloisklink.com>
2022-12-20 09:37:26 -08:00
Sidharth Vinod
cdba2b4ac8
Update CDN links
2022-12-20 10:56:39 +05:30
steph
469bdcef2f
add support for vitepress blocks
2022-12-19 21:14:39 -08:00
Sidharth Vinod
2baa36fd1f
Merge pull request #3930 from Frank-Mayer/patch-1
...
fixed Composition arrow
2022-12-20 10:40:54 +05:30
steph
fca58f5942
remove text and add social icons
2022-12-19 17:45:25 -08:00
Steph
f17f81d12c
Merge branch 'develop' into docs/navbar
2022-12-19 12:16:06 -08:00
Frank Mayer
86946c9bfd
fixed Composition arrow
...
Composition arrow was displayed as \*-- but should be *--
2022-12-19 15:38:52 +01:00
Sidharth Vinod
95e4443ff2
Merge branch 'master' into develop
...
* master:
Revert "Add CNAME"
fix Redirect
fix: Remove basepath from docs
2022-12-19 14:26:54 +05:30
Sidharth Vinod
81aee3554e
Revert "Add CNAME"
...
This reverts commit 7670ada9ac
.
2022-12-19 14:26:20 +05:30
Sidharth Vinod
fd5780d5a1
fix Redirect
2022-12-19 13:51:05 +05:30
Sidharth Vinod
8e7dd1d148
fix: Remove basepath from docs
2022-12-19 13:29:09 +05:30
Sidharth Vinod
14ea1430d8
Merge branch 'develop' of https://github.com/mermaid-js/mermaid into develop
...
* 'develop' of https://github.com/mermaid-js/mermaid :
chore(deps): update pnpm to v7.18.2
docs: fix typo
fix dev server watch mode
2022-12-19 13:13:42 +05:30
Alois Klink
61fdca58a1
Merge pull request #3925 from Foo-x/docs/fix-typo
...
docs: fix typo
2022-12-18 15:58:01 +00:00
Foo-x
a6ea439ef3
docs: fix typo
2022-12-18 23:44:14 +09:00
Tom PERRILLAT-COLLOMB
56e28a7f40
test(generic): add generic type unit test
2022-12-16 22:35:20 +00:00
Tom PERRILLAT-COLLOMB
5705515483
fix(generic): fix generic type regex
...
instead of looking for single tildes, we are now looking for pairs, which avoid bugs when there is an odd number of tildes
2022-12-16 22:17:39 +00:00
Sidharth Vinod
612f9327e9
Merge branch 'master' into develop
...
* master:
Add CNAME
2022-12-17 00:34:07 +05:30
Alois Klink
1e3d76a0aa
docs(README.zh-CN): fix book image src
...
Copied from ec026eaf82
2022-12-16 18:31:25 +00:00
Sidharth Vinod
7670ada9ac
Add CNAME
2022-12-16 21:59:44 +05:30
Knut Sveidqvist
bb9b0b015e
#815 Styling subgraphs with color shades
2022-12-16 16:28:24 +01:00
Ashley Engelund
521a30dcd7
add a space near the start for symmetry and readability
...
Co-authored-by: Sidharth Vinod <sidharthv96@gmail.com>
2022-12-16 06:37:05 -08:00
Knut Sveidqvist
3e64b439ce
Merge pull request #3917 from tomperr/feature/3910_er_unique_key
...
feat(er): add unique key
2022-12-16 13:03:30 +01:00
Knut Sveidqvist
1bf636d697
Merge pull request #3892 from mahomedalid/feature/3771_string_length
...
Adding support for parenthesis in the er diagram attribute types.
2022-12-16 12:58:30 +01:00
Sidharth Vinod
f019250494
Merge pull request #3916 from aloisklink/fix/use-determenistic-uuids-for-er-diagrams
...
fix(er): switch to deterministic UUIDs in ER
2022-12-16 12:44:12 +05:30
steph
528facf88d
minor syntax update
2022-12-15 13:11:07 -08:00
Alois Klink
7855edae6b
perf(er): pre-calculcate er UUID namespace
...
Pre-calculate the entity-relationship diagram namespace UUID.
This UUID is always constant, so we can pre-calculate it to save a
bit of processing power on the client.
Co-authored-by: "Ashley Engelund (weedySeaDragon @ github)" <ashley.engelund@gmail.com>
Co-authored-by: Sidharth Vinod <sidharthv96@gmail.com>
2022-12-15 20:22:39 +00:00
Sidharth Vinod
33f78a5429
Merge branch 'master' into develop
...
* master:
Fix book link
Add book landing page back
2022-12-16 01:28:42 +05:30
Sidharth Vinod
60d0185698
Fix book link
2022-12-16 01:27:15 +05:30
Sidharth Vinod
2743b72a87
Add book landing page back
2022-12-16 01:12:50 +05:30
ashishj
61ef4692b0
Updated documentation and examples
2022-12-15 20:24:13 +01:00
Sidharth Vinod
7b13b489c2
Merge branch 'master' into develop
...
* master: (23 commits)
Update vitepress
fix: Add icon css
fix Top level await
v9.3.0
bump dagre-es 7.0.6
Bump mermaid version
Update dagre-es
Bump mermaid version
fix: Incorrect removal of existing elements
fix: add .js to external imports.
fix: add .js to external imports.
Bump mermaid version
fix: add .js to external imports.
Bump mermaid version
fix: Throw correct errors when parsing diagrams with errors
Update url snapshot test for external diagrams
Update url snapshot test for external diagrams
Updated package number
Updated package number
Updated package number to 9.3.0-rc1
...
2022-12-16 00:51:16 +05:30
Sidharth Vinod
d6ddf9568e
Fix theming doc
2022-12-16 00:49:35 +05:30
ashishj
6ab7eb55cb
Updated styling and added documentation
2022-12-15 20:14:49 +01:00
Sidharth Vinod
ec026eaf82
Fix book link
2022-12-16 00:37:37 +05:30
Tom PERRILLAT-COLLOMB
c7f085a138
doc(er): add documentation on UK constraint
2022-12-15 19:03:00 +00:00
Tom PERRILLAT-COLLOMB
32a8061cc2
feat(er): add UK attribute constraint
...
Any attribute can now be PK, FK or UK
2022-12-15 18:55:08 +00:00
BD103
1495baac2c
Merge branch 'develop' into patch-1
2022-12-15 13:20:45 -05:00
Alois Klink
ac5a1b4501
fix(er): switch to deterministic uuids in ER
...
The entity relation diagram uses uuid v4, which is randomly generated.
uuid v5 uses a SHA-1 hash, which makes the uuid deterministic.
The input strings are unique for each diagram, so this should be
okay.
2022-12-15 18:00:48 +00:00
Sidharth Vinod
01039c574c
Merge pull request #3914 from tommoor/patch-1
...
fix: Typescript error in usage
2022-12-15 21:45:06 +05:30
Sidharth Vinod
4e70f327c4
Merge pull request #3897 from weedySeaDragon/feat/3896_a11y-svg-role-graphics-doc-doc
...
feat: Set svg role to 'graphics-document document'
2022-12-15 21:42:08 +05:30
ashishj
fefcc43dd4
Merged Develop in timeline branch
2022-12-15 17:10:56 +01:00
ashishj
2141057ab4
add more runnning examples
2022-12-15 17:00:53 +01:00
Tom Moor
78dd03dcdb
lint
2022-12-15 09:29:30 -05:00
Tom Moor
9f2d29b68b
fix typescript error
2022-12-15 06:09:22 -08:00
Sidharth Vinod
d841ad8f3e
Update vitepress
2022-12-15 17:09:24 +05:30
Sidharth Vinod
3fb0b2792e
fix: Add icon css
2022-12-15 15:33:51 +05:30
Sidharth Vinod
bbc4e90c89
fix Top level await
2022-12-15 14:57:08 +05:30
Sidharth Vinod
774512df57
v9.3.0
2022-12-15 14:18:54 +05:30
Sidharth Vinod
152994047e
bump dagre-es 7.0.6
2022-12-15 09:12:08 +05:30
Sidharth Vinod
d194e78677
Bump mermaid version
2022-12-14 09:45:34 +05:30
Sidharth Vinod
16b51800d0
Update dagre-es
2022-12-14 09:45:18 +05:30
Sidharth Vinod
2176bef537
Bump mermaid version
2022-12-13 13:44:03 +05:30
Sidharth Vinod
9f9c95b0b3
fix: Incorrect removal of existing elements
2022-12-13 13:42:07 +05:30
Sidharth Vinod
3f0b13a131
fix: add .js to external imports.
2022-12-13 00:38:54 +05:30
Sidharth Vinod
3c44379af9
fix: add .js to external imports.
2022-12-13 00:34:31 +05:30
Sidharth Vinod
1d529d80d1
Bump mermaid version
2022-12-13 00:23:41 +05:30
Sidharth Vinod
89451ca640
fix: add .js to external imports.
2022-12-13 00:22:57 +05:30
Sidharth Vinod
fac3a4d29b
Bump mermaid version
2022-12-12 23:52:48 +05:30
Sidharth Vinod
d7610dda8f
fix: Throw correct errors when parsing diagrams with errors
2022-12-12 23:51:46 +05:30
Jesper Hasselquist
32fcea3bdd
fix(docs): remove duplicate section
...
Remove duplicate `Return Type` section
2022-12-12 21:39:19 +09:00
steph
e4622ba06e
fix text overflow
2022-12-11 20:53:14 -08:00
Maho Pacheco
6fb9b3b353
Adding UTs for attributes with variable length in er diagram
2022-12-11 19:45:05 -08:00
steph
1b0ea981f9
update navbar
2022-12-11 18:59:01 -08:00
Knut Sveidqvist
14f7756fdb
#815 Adding labels to edges
2022-12-11 09:24:05 +01:00
Ashley Engelund
76e9e07370
Add links to github atom add-ons
...
Co-authored-by: Alois Klink <alois@aloisklink.com>
2022-12-10 13:46:24 -08:00
Ashley Engelund (weedySeaDragon @ github)
ae7fd777a7
+ parsing specs that actually check results
2022-12-09 16:22:56 -08:00
Ashley Engelund (weedySeaDragon @ github)
d666981599
parser: remove extra popState; whitespace formatting; remove 'zxzx' weird string
2022-12-09 16:21:28 -08:00
Ashley Engelund (weedySeaDragon @ github)
ae25a08fe3
(minor) add JSDOC comments
2022-12-09 13:35:44 -08:00
Ashley Engelund (weedySeaDragon @ github)
2b7aa3f99d
start of parser spec; test for this bug
2022-12-09 13:35:23 -08:00
Ashley Engelund (weedySeaDragon @ github)
e7b4f7f6ca
trim state ids as they are processed by docTranslator
2022-12-09 13:33:51 -08:00
Ashley Engelund (weedySeaDragon @ github)
de795a915e
remove links from atom.io; add note Atom has been archived
2022-12-09 04:56:55 -08:00
Ashley Engelund (weedySeaDragon @ github)
e59b830d74
set svg role to 'graphics-document document'
2022-12-08 11:25:04 -08:00
Knut Sveidqvist
0b01c3376d
#815 Adding labels to subgraphs
2022-12-08 19:41:17 +01:00
Per Brolin
4f169dd2b8
Updated package number
2022-12-08 15:16:13 +01:00
Per Brolin
23a44952ac
Updated package number
2022-12-08 15:09:49 +01:00
Knut Sveidqvist
9b27396344
Small fix
2022-12-08 13:21:56 +01:00
Ashley Engelund (weedySeaDragon @ github)
1c9a559362
common function for a11y; add to renderAsync; + renderAsync spec
2022-12-07 10:19:30 -08:00
Ashley Engelund (weedySeaDragon @ github)
b1dd0008bc
Merge remote-tracking branch 'MERMAID/develop' into feat/3626-aria-descBy-roledescription-mocks
2022-12-07 09:31:20 -08:00
Knut Sveidqvist
ebf76e3d1f
#815 Using elk for flowchart layouts
2022-12-07 09:37:27 +01:00
Knut Sveidqvist
033201ff1f
Merge pull request #3889 from huynhicode/docs/theming
...
docs: refactor Theming doc
2022-12-07 08:55:00 +01:00
Sidharth Vinod
f2a85eafac
Merge remote-tracking branch 'origin/develop' into pr/BD103/3890
...
* origin/develop:
chore: Update cspell
Update docs
fix: docs build command
chore: Rebuild docs if linting fails
chore: Format Mermaid.vue
Made mermaidConfig a local variable so that it cannot be shared cross rendering.
Fixed an issue that diagrams disappear from docs pages when switching themes or reloading pages
Fixed the issue that theme-switch does not work on docs.
Get base sha from PR
Run doc lint only if files changed
Run doc lint only if files changed
Run doc lint only if files changed
split lint docs action
split lint docs action
fix: File location
fix(docs): Test auto commit
fix(docs): Test auto commit
fix(docs): Test auto commit
chore: Update docs path
chore: Auto build docs if only src/docs is changed
2022-12-07 11:50:45 +05:30
Sidharth Vinod
963a1f1eb1
Merge remote-tracking branch 'origin/develop' into sidv/autoBuildDocs
...
* origin/develop: (564 commits)
chore: Format Mermaid.vue
Made mermaidConfig a local variable so that it cannot be shared cross rendering.
Fix for issue #3882 moving the label when the path has been modified
Small fix for issue #3881
Fixed an issue that diagrams disappear from docs pages when switching themes or reloading pages
Fixed the issue that theme-switch does not work on docs.
chore: Fix mindmap link
chore: Switch back from unpkg to jsdelivr
delete functions not used in diagrams/c4 code (dead code)
Minor change
feat: Add @include support to docs
feat: Add @include example to docs
feat: Add @include support to docs
cleanup
fix lines
fix Async rendering
Revert "sync"
chore(deps): update pnpm to v7.17.1
chore(deps): remove dependency on `graphlib`
test(e2e): make gitgraph snapshots consistent
...
2022-12-07 11:11:45 +05:30
Maho Pacheco
4dadf8a72d
Adding support for parentheses
2022-12-06 10:38:21 -08:00
Sidharth Vinod
fdf261bda3
chore: Format Mermaid.vue
2022-12-06 15:53:36 +05:30
Sidharth Vinod
f2ee20fdf5
Merge pull request #3880 from ZenUml/defects/issue-3878
...
Defects/issue 3878
2022-12-06 15:52:15 +05:30
MrCoder
7a086890fd
Made mermaidConfig a local variable so that it cannot be shared cross rendering.
2022-12-06 19:44:14 +11:00
BD103
49ca2e3588
feat: add links to theme listing
2022-12-05 17:41:30 -05:00
steph
f0aea0e6af
fix cspell
2022-12-04 22:04:20 -08:00
steph
24560b7d13
fix lint
2022-12-04 21:51:29 -08:00
steph
d451a0c508
refactor theming doc
2022-12-04 21:20:09 -08:00
Ashley Engelund (weedySeaDragon @ github)
96996d0fba
Merge remote-tracking branch 'MERMAID/develop' into feat/3626-aria-descBy-roledescription-mocks
2022-12-03 12:13:12 -08:00
Knut Sveidqvist
4124d186d0
Fix for issue #3882 moving the label when the path has been modified
2022-12-03 13:21:10 +01:00
Knut Sveidqvist
b68fee7e65
Small fix for issue #3881
2022-12-03 11:41:29 +01:00
Knut Sveidqvist
4863d0d29d
Adding new flowchart renderer using elk
2022-12-03 09:47:01 +01:00
MrCoder
a1e4ffb3f0
Fixed an issue that diagrams disappear from docs pages when switching themes or reloading pages
2022-12-03 19:30:09 +11:00
MrCoder
c7471f1755
Fixed the issue that theme-switch does not work on docs.
2022-12-03 19:10:05 +11:00
Sidharth Vinod
abc6ee049d
Merge pull request #3873 from mermaid-js/sidv/jsdelivr
...
Switch back to jsdelivr
2022-12-02 13:31:22 +05:30
Knut Sveidqvist
4f1b26fd76
Adding new flowchart renderer using cytoscape
2022-12-02 08:06:16 +01:00
Alois Klink
accba3f408
chore: improve errors for bad YAML frontmatter
...
Adds a custom error message for any mermaid diagram that starts with
a `---`. Normally, these are expected to be part of a YAML front-matter
block, but indentation issues or a missing closing `---` may cause
these to be not parsed correctly.
2022-12-01 22:43:03 +00:00
Ashley Engelund (weedySeaDragon @ github)
bfe3f309d2
remove typeof
2022-12-01 10:09:43 -08:00
Ashley Engelund (weedySeaDragon @ github)
f036d58ec3
Merge remote-tracking branch 'MERMAID/develop' into feat/3626-aria-descBy-roledescription-mocks
...
# Conflicts:
# cypress/integration/rendering/gantt.spec.js
# cypress/integration/rendering/requirement.spec.js
# docs/config/setup/modules/mermaidAPI.md
# packages/mermaid/src/accessibility.js
2022-12-01 10:08:44 -08:00
Sidharth Vinod
bcbf68b7e1
Merge pull request #3871 from weedySeaDragon/chore/c4-remove-unused-code
...
chore: delete functions not used in diagrams/c4 code (dead code)
2022-12-01 23:07:29 +05:30
Sidharth Vinod
1e30e33ad3
chore: Fix mindmap link
2022-12-01 13:51:50 +05:30
Sidharth Vinod
41033008ec
Merge branch 'master' into develop
...
* master:
doc: Add mindmap integration docs
fix: Fetch depth
fix: Fetch depth
fix: Fetch depth
fix: Add commit count to release preview
fix: Add commit count to release preview
chore: Add working directory
fix: release-preview-publish.yml
Fix #3799 : Remove `type` from package.json
2022-12-01 11:39:28 +05:30
Sidharth Vinod
cd0eae2807
chore: Switch back from unpkg to jsdelivr
2022-12-01 11:23:50 +05:30
Sidharth Vinod
8cb6fbfab0
Merge branch 'master' into sidv/jsdelivr
...
* master:
doc: Add mindmap integration docs
fix: Fetch depth
fix: Fetch depth
fix: Fetch depth
fix: Add commit count to release preview
fix: Add commit count to release preview
chore: Add working directory
fix: release-preview-publish.yml
Fix #3799 : Remove `type` from package.json
2022-12-01 11:20:16 +05:30
Alois Klink
f884b745dc
Merge branch 'develop' into fix/3706_support-indented-yaml-only-in-html
...
Conflicts:
- pnpm-lock.yaml
2022-11-30 21:11:48 +00:00
Ashley Engelund (weedySeaDragon @ github)
6f2b0c43cb
delete functions not used in diagrams/c4 code (dead code)
2022-11-30 12:43:27 -08:00
Sidharth Vinod
15cfa5d40d
Merge branch 'develop' into sidv/splitDiagrams
...
* develop: (79 commits)
Minor change
feat: Add @include support to docs
feat: Add @include example to docs
feat: Add @include support to docs
cleanup
fix lines
fix Async rendering
Revert "sync"
chore(deps): update pnpm to v7.17.1
chore(deps): remove dependency on `graphlib`
test(e2e): make gitgraph snapshots consistent
chore: Fix lint
test: Update vitest
Add official vim plugin to list in integrations
chore: Cleanup package.json
chore: Cleanup package.json
chore: Cleanup package.json
fix lock
Docs
Fix: array concat
...
2022-11-30 19:15:21 +05:30
Knut Sveidqvist
650ee31cd1
Merge pull request #3845 from mermaid-js/sidv/eslintCleanup
...
Housekeeping with eslint-unicorn
2022-11-30 11:53:16 +01:00
Sidharth Vinod
36cf7e0601
Merge pull request #3863 from mermaid-js/sidv/includeMD
...
Add support for @include in docs
2022-11-30 00:51:29 +05:30
Knut Sveidqvist
ff1d56e9b5
Merge pull request #3846 from mermaid-js/sidv/mermaidDocs
...
Use current mermaid version in docs.
2022-11-29 17:13:52 +01:00
Knut Sveidqvist
5e98e99f86
Merge pull request #3829 from DanInProgress/fix/stylis-add-idselector
...
Use stylis to prepend idSelector
2022-11-29 17:10:27 +01:00
Sidharth Vinod
316f612bde
feat: Add @include support to docs
2022-11-29 00:54:01 +05:30
Sidharth Vinod
2a5c2b58de
feat: Add @include example to docs
2022-11-29 00:34:57 +05:30
Sidharth Vinod
e8703a59ec
feat: Add @include support to docs
2022-11-29 00:34:29 +05:30
Sidharth Vinod
3a6dd61f65
cleanup
2022-11-28 16:26:10 +05:30
Sidharth Vinod
1f147b6b63
Merge branch 'develop' into sidv/mermaidDocs
...
* develop:
chore(deps): update pnpm to v7.17.1
chore(deps): remove dependency on `graphlib`
test(e2e): make gitgraph snapshots consistent
2022-11-28 16:13:27 +05:30
Sidharth Vinod
e302ee383a
fix Async rendering
2022-11-28 16:11:24 +05:30
Sidharth Vinod
527a3df083
Revert "sync"
...
This reverts commit a88a467d45
.
2022-11-28 15:44:19 +05:30
Ashley Engelund (weedySeaDragon @ github)
2bf753a769
use camelCase
2022-11-27 19:17:37 -08:00
Ashley Engelund (weedySeaDragon @ github)
6044e9e9e8
make test title clearer
2022-11-27 19:17:17 -08:00
Ashley Engelund (weedySeaDragon @ github)
e9d4372c41
Merge remote-tracking branch 'MERMAID/develop' into feat/3626-aria-descBy-roledescription-mocks
2022-11-27 19:10:28 -08:00
Alois Klink
05b25db5eb
chore(deps): remove dependency on graphlib
...
`graphlib` has recently been replaced with the ESM version of
graphlib bundled with
[`dagre-d3-es`](https://www.npmjs.com/package/dagre-d3-es ), in commit
f687abb1
(chore: Use `graphlib` from `dagre-d3-es`, 2022-11-20)
This means we can safely remove it from our dependencies list.
Fixes: f687abb165
2022-11-27 19:13:53 +00:00
Ashley Engelund (weedySeaDragon @ github)
6e486d3c49
add test for multi-line accDescr
2022-11-27 10:32:25 -08:00
Alois Klink
5cfa919672
fix: support parsing indented mmd YAML from HTML
...
In order to parse the YAML front-matter in a Mermaid diagram, the
YAML seperators **MUST NOT** be indented, e.g.:
````markdown
```mermaid
---
title: This is fine.
---
```
```mermaid
---
title: This is not fine, because the `---` are indented.
---
```
````
However, this makes it very difficult to write nice Mermaid diagrams in
HTML code-blocks.
This commit uses [`ts-dedent`](https://www.npmjs.com/package/ts-dedent )
to automatically remove the indentation from Mermaid diagrams when
parsed from HTML. Mermaid diagrams from mermaidAPI.render() are **NOT**
dedented, as that API is called from JavaScript code, and therefore
users can easily `dedent` their own diagrams.
2022-11-27 18:19:13 +00:00
Ashley Engelund (weedySeaDragon @ github)
f1bc2deafd
use MockedD3, spies in util insertTitle spec (remove MockD3)
2022-11-27 10:14:11 -08:00
Ashley Engelund (weedySeaDragon @ github)
7508cd796d
(minor) fix comment, comment typo
2022-11-27 10:13:32 -08:00
Ashley Engelund (weedySeaDragon @ github)
626a4741c0
Merge remote-tracking branch 'MERMAID/develop' into feat/3626-aria-descBy-roledescription-mocks
2022-11-25 11:30:44 -08:00
Sidharth Vinod
f425a02cf9
Merge branch 'develop' into sidv/mermaidDocs
...
* develop:
chore: Fix lint
test: Update vitest
Add official vim plugin to list in integrations
chore: Add lodash-eslint rule
chore: Add lodash-eslint rule
feat: Spellcheck docs when building
fix: Enable extending lintstagedrc.
fix: lintstagedrc `lint:jison`
Fix lodash import
Formatting
Update .vite/build.ts
fix Lint
Add docs back
fix: Core build externals
chore: Update dagre-d3-es
chore: Use `graphlib` from `dagre-d3-es`
fix: Add types to memoized functions
chore: Replace lodash with lodash-es
Cleanup
2022-11-25 16:21:05 +05:30
Sidharth Vinod
3e4dc306d4
Merge pull request #3847 from craigmac/patch-1
...
Add official vim plugin to list in integrations
2022-11-25 12:01:32 +05:30
Sidharth Vinod
4a4eff55c1
chore: Fix lint
2022-11-25 12:00:31 +05:30
Sidharth Vinod
5e330a6d78
test: Update vitest
2022-11-24 16:33:42 +05:30
C.D. MacEachern
ecf1273c82
Add official vim plugin to list in integrations
...
364438d1e8
added recognition of Mermaid files to Vim. Link here is to the upstream source from which it comes.
2022-11-23 15:25:06 -05:00
ashishj
0d5246fbc7
initial commit
2022-11-23 19:28:26 +01:00
Sidharth Vinod
a4fec411bd
Merge branch 'develop' into sidv/eslintCleanup
...
* develop:
chore: Add lodash-eslint rule
chore: Add lodash-eslint rule
feat: Spellcheck docs when building
fix: Enable extending lintstagedrc.
fix: lintstagedrc `lint:jison`
2022-11-23 20:52:36 +05:30
Knut Sveidqvist
50aab56177
Merge pull request #3844 from mermaid-js/sidv/fixLintStaged
...
fix: LintStaged
2022-11-23 13:52:40 +01:00
Sidharth Vinod
cc1c98325c
chore: Cleanup package.json
2022-11-23 16:08:41 +05:30
Sidharth Vinod
f8b05f7d75
chore: Cleanup package.json
2022-11-23 16:07:58 +05:30
Sidharth Vinod
01a24296b6
Docs
2022-11-23 15:57:50 +05:30
Sidharth Vinod
ab81b508ce
Merge branch 'develop' into sidv/mermaidDocs
...
* develop: (79 commits)
chore: docs:build
chore: docs:build
tiny fix and change: "The/y cannot" -> "Cannot..."
remove 'horz' from cSpell.json
update demos/state.html to includ examples; formatting
add 'horz' to cSpell (in pieDetector.ts commented out barChart work)
refine - what is not done yet
remove 'horz' from cSpell.json
Revert "Added pie"
chore: Fix cSpell in pieRenderer
update demos/state.html to includ examples; formatting
add 'horz' to cSpell (in pieDetector.ts commented out barChart work)
refine - what is not done yet
remove console stmt
#3831 Re-enabling themes for er diagrams
#3835 Adding path to list of elements to be styled
#3882 fix for issues with mindmaps with only a single node
chore(deps): update pnpm to v7.17.0
docs: Remove warning in readme
chore(deps): update lycheeverse/lychee-action action to v1.5.4
...
2022-11-23 15:57:06 +05:30
Sidharth Vinod
ed6fb15c38
Fix: array concat
2022-11-23 13:39:15 +05:30
Sidharth Vinod
7f4368415d
chore: Add eslint-unicorn & fix
2022-11-23 01:05:08 +05:30
Sidharth Vinod
9da29da63b
Merge branch 'develop' into sidv/optimizeSize
...
* develop: (21 commits)
chore: docs:build
chore: docs:build
tiny fix and change: "The/y cannot" -> "Cannot..."
remove 'horz' from cSpell.json
update demos/state.html to includ examples; formatting
add 'horz' to cSpell (in pieDetector.ts commented out barChart work)
refine - what is not done yet
remove 'horz' from cSpell.json
Revert "Added pie"
chore: Fix cSpell in pieRenderer
update demos/state.html to includ examples; formatting
add 'horz' to cSpell (in pieDetector.ts commented out barChart work)
refine - what is not done yet
remove console stmt
#3831 Re-enabling themes for er diagrams
#3835 Adding path to list of elements to be styled
#3882 fix for issues with mindmaps with only a single node
Integrations added - Visual Studio Code [Polyglot Interactive Notebooks]
Fix typos
#3778 Adding a hexgon shape
...
2022-11-22 23:49:39 +05:30
Sidharth Vinod
f2ed255137
Merge pull request #3821 from dfinke/develop
...
Integrations added - Visual Studio Code [Polyglot Interactive Notebooks]
2022-11-22 23:22:19 +05:30
Sidharth Vinod
1ca49c696a
Merge branch 'develop' into feat/1952-state--classDef-documentation
...
* develop:
chore: docs:build
Fix typos
2022-11-22 23:17:33 +05:30
Sidharth Vinod
8e8259934e
Merge pull request #3820 from endolith/typos
...
Fix typos
2022-11-22 23:17:11 +05:30
Sidharth Vinod
183dee89c2
feat: Spellcheck docs when building
...
docs.yml is removed as `docs:verify` will cover spellchecks now.
2022-11-22 23:06:12 +05:30
Sidharth Vinod
009a32d20b
fix: Enable extending lintstagedrc.
2022-11-22 23:05:27 +05:30
Ashley Engelund (weedySeaDragon @ github)
338d83d4a5
Merge branch 'feat/1952-state--classDef-documentation' of github.com:weedySeaDragon/mermaid into feat/1952-state--classDef-documentation
...
Conflicts:
docs/syntax/stateDiagram.md
packages/mermaid/src/diagrams/pie/pieDetector.ts
packages/mermaid/src/docs/syntax/stateDiagram.md
2022-11-22 09:09:40 -08:00
Ashley Engelund (weedySeaDragon @ github)
c3e054c155
tiny fix and change: "The/y cannot" -> "Cannot..."
2022-11-22 08:58:55 -08:00
Ashley Engelund (weedySeaDragon @ github)
7f5b48920c
update demos/state.html to includ examples; formatting
2022-11-22 08:56:04 -08:00
Ashley Engelund (weedySeaDragon @ github)
8066aaeeb0
refine - what is not done yet
2022-11-22 08:55:56 -08:00
Sidharth Vinod
5967289172
fix: lintstagedrc lint:jison
2022-11-22 14:47:49 +05:30
Per Brolin
9eb506f6c5
Revert "Added pie"
...
This reverts commit 1d9fefe7ac
.
2022-11-22 10:04:28 +01:00
Sidharth Vinod
31380368e1
chore: Fix cSpell in pieRenderer
2022-11-22 10:49:45 +05:30
Ashley Engelund (weedySeaDragon @ github)
e2e604a76a
update demos/state.html to includ examples; formatting
2022-11-21 17:00:54 -08:00
Ashley Engelund (weedySeaDragon @ github)
98e4b6f338
add 'horz' to cSpell (in pieDetector.ts commented out barChart work)
2022-11-21 17:00:54 -08:00
Ashley Engelund (weedySeaDragon @ github)
e1c2b1ddb5
refine - what is not done yet
2022-11-21 17:00:54 -08:00
Ashley Engelund (weedySeaDragon @ github)
22993e8b6c
remove console stmt
2022-11-21 16:35:02 -08:00
Per Brolin
fdbc4ce0ed
Merge branch 'develop' of github.com:mermaid-js/mermaid into develop
2022-11-21 14:45:25 +01:00
pbrolin47
96d7666d8e
Merge pull request #3837 from mermaid-js/3831_er_theme
...
#3831 Re-enabling themes for er diagrams
2022-11-21 14:43:41 +01:00
pbrolin47
0e3a558b02
Merge pull request #3836 from mermaid-js/3835_handling_classes_to_paths
...
Fix for #3835 , makes it possible to style path elements
2022-11-21 14:40:10 +01:00
Knut Sveidqvist
f9222a3bf4
#3831 Re-enabling themes for er diagrams
2022-11-21 14:30:06 +01:00
Knut Sveidqvist
78b7941f2d
#3835 Adding path to list of elements to be styled
2022-11-21 14:06:09 +01:00
pbrolin47
0d27b1aa65
Merge pull request #3834 from mermaid-js/3778_adding_more_mindmap_shapes
...
#3778 Adding a hexgon shape
2022-11-21 13:50:53 +01:00
Sidharth Vinod
9b01a07b9d
Fix lodash import
2022-11-21 18:13:35 +05:30
pbrolin47
32db43069d
Merge pull request #3833 from mermaid-js/3832_mindmaps_single_node
...
#3882 fix for issues with mindmaps with only a single node
2022-11-21 13:39:16 +01:00
Sidharth Vinod
89488b60a4
Formatting
2022-11-21 18:06:53 +05:30
Sidharth Vinod
a686255d9e
Merge branch 'develop' into sidv/optimizeSize
...
* develop:
chore(deps): update pnpm to v7.17.0
docs: Remove warning in readme
chore(deps): update lycheeverse/lychee-action action to v1.5.4
chore: Add size shield in readme
Fix example for Git diagrams
Fix TS errors
Add interface for DiagramDb and other minor changes
Disallow leading whitespace before delimiter
Add title support using YAML frontmatter
2022-11-21 18:06:30 +05:30
Knut Sveidqvist
ffb95b4fa9
Merge pull request #3823 from mermaid-js/sidv/viz
...
Add package visualizations
2022-11-21 13:32:19 +01:00
Knut Sveidqvist
29a02d1ab5
Merge pull request #3809 from aloisklink/use-dagre-d3-es
...
Replace `dagre`/`dagre-d3` with `dagre-d3-es`
2022-11-21 13:31:35 +01:00
Knut Sveidqvist
564414ecac
#3882 fix for issues with mindmaps with only a single node
2022-11-21 13:23:25 +01:00
Knut Sveidqvist
050574f60f
Merge pull request #3706 from MasonM/feature/1433_title_support
...
feat: Title support via front matter for ER, state, class, git, and graph diagrams
2022-11-21 11:44:26 +01:00
Sidharth Vinod
ed6ad77fd9
docs: Remove warning in readme
2022-11-21 11:52:57 +05:30
Dan Fallon
1f64302ae2
Use stylis to prepend idSelector
...
code previously manually inserted idSelector before the generated CSS.
This could produce incorrect CSS.
Adding & in front of rules will ensure that it behaves properly.
Stylis seems permissive about the lack of nesting selector, but fails
if there is no selector at all. (e.g. "{...props...}")
We should probably do this for each diagram's style.ts files as well
2022-11-20 23:11:05 -06:00
Sidharth Vinod
de99cdfb4c
chore: Add size shield in readme
...
Co-authored-by: Alois Klink <alois@aloisklink.com>
2022-11-21 08:22:10 +05:30
Sidharth Vinod
de8ce77f37
fix Lint
2022-11-21 08:16:16 +05:30
Sidharth Vinod
13ef403921
chore: Update dagre-d3-es
2022-11-21 08:16:15 +05:30
Sidharth Vinod
f687abb165
chore: Use graphlib
from dagre-d3-es
2022-11-21 08:16:08 +05:30
Sidharth Vinod
931661ed67
fix: Add types to memoized functions
2022-11-21 08:13:44 +05:30
Sidharth Vinod
7d3a0577d2
chore: Replace lodash with lodash-es
2022-11-21 08:13:44 +05:30
Sidharth Vinod
4890999206
Merge branch 'sidv/viz' into sidv/dagre-es-viz
...
* sidv/viz:
Fix Lodash import
fix: Viz build
feat: Add package visualization
Ignore stats.html
feat: Add bundle visualization
style(docs): use `github-dark` hightlight theme
refactor(docs): use default vitepress highlighter
fix: Move redirection to router
chore: Add docs to redirect.ts
feat: Redirect old documentation links.
comments in states are skipped now
Remove extra arrow and adjust cross position
2022-11-21 08:13:43 +05:30
Ashley Engelund (weedySeaDragon @ github)
a9c337302a
export D3Element from mermaidAPI; use in accessibility
2022-11-20 12:27:29 -08:00
Ashley Engelund
2a98791ec9
use optional chaining check for get acc title and get acc description
...
Co-authored-by: Alois Klink <alois@aloisklink.com>
2022-11-20 12:17:21 -08:00
Sidharth Vinod
8a2d3a400c
Fix Lodash import
2022-11-20 19:12:52 +05:30
Sidharth Vinod
bf53a03c9d
fix: Use lodash
instead of lodash-es
...
lodash with specific imports use lesser space than lodash-es
2022-11-20 18:30:01 +05:30
Sidharth Vinod
bc269a966d
Merge branch 'sidv/sizeCheck' into sidv/splitDiagrams
...
* sidv/sizeCheck:
feat: Add size inspection plugin
2022-11-20 12:09:42 +05:30
Sidharth Vinod
d39606cb47
fix: Mindmap link
2022-11-20 12:04:28 +05:30
Sidharth Vinod
b04517b146
chore: Cleanup
2022-11-20 12:00:34 +05:30
Sidharth Vinod
024ee4213f
Merge branch 'develop' into sidv/splitDiagrams
...
* develop: (233 commits)
style(docs): use `github-dark` hightlight theme
refactor(docs): use default vitepress highlighter
fix: Move redirection to router
ci(renovate): disable pinning dependencies
Revert "chore(deps): pin dependencies"
change shiki getHighlighter import
create separate spec for stateRenderer-v2
diagramStates should not be global; pass it into functions; minor comment fixes
diagramClasses no longer needs to be cached; mermaidAPI no longer calls it repeatedly
(minor) import expectTypeOf in spec
(minor) fix JSdoc tag
+ spec stateRenderer-v2.js getClasses() to verify it returns a {}
(minor) fix JSdoc types in comments
(minor) add comments, remove duplicated line
chore: Add master to link checker
chore: Add docs to redirect.ts
stateDB classes must be a {} not []
feat: Redirect old documentation links.
add stateDiagram-v2 to list of graphs with classDefs
fix(docs): ClassDiagram table
...
2022-11-20 11:58:55 +05:30
Sidharth Vinod
e861fbb517
feat: unbundle styles
2022-11-20 11:09:08 +05:30
Mason Malone
bdf8b01185
Fix example for Git diagrams
2022-11-19 13:20:12 -08:00
Mason Malone
1b201bf462
Fix TS errors
2022-11-19 13:01:21 -08:00
Mason Malone
3316aa5f4f
Add interface for DiagramDb and other minor changes
2022-11-19 12:52:49 -08:00
Mason Malone
a11ab3d5ea
Disallow leading whitespace before delimiter
2022-11-19 12:52:49 -08:00
Sidharth Vinod
2e028ce36d
chore: Unify registerLazyLoadedDiagrams
2022-11-20 00:38:35 +05:30
Doug Finke
2a0f6d4cc9
Integrations added - Visual Studio Code [Polyglot Interactive Notebooks]
2022-11-19 11:20:13 -05:00
endolith
e3b9dbdf13
Fix typos
2022-11-19 09:33:01 -05:00
Mason Malone
70f024735b
Add title support using YAML frontmatter
2022-11-18 20:42:54 -08:00
Alois Klink
fd76e0e270
chore: replace dagre/dagre-d3 with dagre-d3-es
...
Replace the dagre and dagre-d3 libraries with dagre-d3-es.
Both dagre and dagre-d3 are deprecated and unmaintained,
and haven't been updated for more than 3 years.
Since dagre-d3 still requires an old version of d3, this causes
a bunch of security warnings,
e.g. https://github.com/advisories/GHSA-36jr-mh4h-2g58
The [dagre-d3-es](https://github.com/tbo47/dagre-es ) package is a fork
that contains support for `"d3": "^7.6.1"`. Also, it's ESM, so we will
hopefully get smaller bundle sizes too. The only issue is that this
fork isn't very well used (only has 3000 weekly downloads),
compared to `dagre-d3`'s 250,000 weekly downloads.
(although to be fair, a large proportion of dagre-d3's downloads
probably come from mermaid)
Since it's is a less popular package,
**I've pinned `dagre-d3-es` to `"7.0.2"` instead of `"^7.0.2"`**.
This does mean if there is a bug in `dagre-d3-es`, we will have to
manually bump it ourselves, but it also means we won't accidentally
be sending a buggy version of `dagre-d3-es` out to users in cases
something changes (it might be worth disabling renovate for this
if we're feeling paranoid!)
2022-11-18 18:33:05 +00:00
Sidharth Vinod
09ed41b7d2
Merge pull request #3807 from aloisklink/docs/update-code-highlighting-theme
...
Use `github-dark` to highlight fence blocks in vitepress docs
2022-11-18 23:09:59 +05:30
Sidharth Vinod
7306b5ac45
feat: Add size inspection plugin
2022-11-18 17:52:55 +05:30
Sidharth Vinod
0854bab124
fix: Remove diagram dependency from mermaidAPI
2022-11-18 16:51:50 +05:30
Sidharth Vinod
fa51121f29
chore(split): Error
2022-11-18 16:30:54 +05:30
Sidharth Vinod
0b4c6f6477
chore(split): Journey
2022-11-18 16:22:38 +05:30
Sidharth Vinod
e5768454f1
chore(split): State Diagram
2022-11-18 16:19:38 +05:30
Sidharth Vinod
89b5eb56f2
chore(split): Orchestration
2022-11-18 16:11:19 +05:30
Sidharth Vinod
616c969a03
chore(split): Flow type
2022-11-18 16:11:03 +05:30
Sidharth Vinod
4fd826ac8c
chore(split): Sequence
2022-11-18 16:10:51 +05:30
Sidharth Vinod
6d5a6ad0c8
chore(split): Requirement
2022-11-18 16:10:42 +05:30
Sidharth Vinod
e0cd76e6fd
chore(split): Pie
2022-11-18 16:10:25 +05:30
Sidharth Vinod
f03364f328
chore(split): Info
2022-11-18 16:10:15 +05:30
Sidharth Vinod
25bc381361
chore(split): gitGraph
2022-11-18 16:10:06 +05:30
Sidharth Vinod
38e5c3a81e
chore(split): Gantt
2022-11-18 16:09:56 +05:30
Sidharth Vinod
43aa831dd2
chore(split): ER
2022-11-18 16:09:45 +05:30
Sidharth Vinod
4492c5ed4e
chore(split): classDiagram
2022-11-18 16:09:36 +05:30
Sidharth Vinod
5dec9eb2f5
fix: C4 type
2022-11-18 16:09:10 +05:30
pbrolin47
804a23595d
Merge pull request #3797 from mermaid-js/sidv/redirectOldDocs
...
feat: Redirect old documentation links.
2022-11-18 10:46:34 +01:00
Knut Sveidqvist
8655db371e
Merge pull request #3762 from avijit1258/bug/3728_comments_not_ignored_composite_states
...
comments in states are skipped now
2022-11-18 10:45:01 +01:00
Knut Sveidqvist
9b8d5c1b3b
Merge pull request #3641 from ishuen/bug/3637_extra_arrow
...
Remove extra arrow and adjust cross position
2022-11-18 10:38:57 +01:00
Sidharth Vinod
02903be558
feat: Split C4 & Flow
2022-11-18 14:28:28 +05:30
Sidharth Vinod
e9f8ba6915
doc: Add mindmap integration docs
2022-11-18 11:28:29 +05:30
Ashley Engelund (weedySeaDragon @ github)
69526402e2
format .md files
2022-11-17 16:51:23 -08:00
Ashley Engelund (weedySeaDragon @ github)
b51759d36e
set describeby to accessible description element id
2022-11-17 15:50:52 -08:00
Ashley Engelund (weedySeaDragon @ github)
68b1805c40
(minor) fix typo, whitespace formatting
2022-11-17 15:49:37 -08:00
Ashley Engelund (weedySeaDragon @ github)
9cc862b951
doc: adding diagrams: revise a11y section
2022-11-17 15:48:17 -08:00
Ashley Engelund (weedySeaDragon @ github)
4fb4aa417c
doc: revise A11y: fix multi-line ex, +describedby, alpha sort examples
2022-11-17 15:47:22 -08:00
Ashley Engelund (weedySeaDragon @ github)
0adc6a6112
remove a11y from individual diagrams; now happens in mermaidAPI render
2022-11-17 12:28:11 -08:00
Ashley Engelund (weedySeaDragon @ github)
29efc116f3
put a11y into mermaidAPI render; add render spec (mock diagram renderers etc)
2022-11-17 12:27:17 -08:00
Ashley Engelund (weedySeaDragon @ github)
1fc02940ae
move mocks specific to only seq spec files out of global d3 mock
2022-11-17 12:24:16 -08:00
Ashley Engelund (weedySeaDragon @ github)
8a3c4f64b2
MockedD3: node() return Element; add selectAll()
2022-11-17 12:23:01 -08:00
Ashley Engelund (weedySeaDragon @ github)
4d7496b8dd
add error checking (empty diagramType, title, desc) to a11y methods
2022-11-17 12:21:45 -08:00
Ashley Engelund (weedySeaDragon @ github)
c3313050ce
Merge remote-tracking branch 'MERMAID/develop' into feat/3626-aria-roledescription-for-svg
2022-11-17 11:17:18 -08:00
Alois Klink
c30aa6f9cf
style(docs): use github-dark
hightlight theme
...
Use the `github-dark` highlight theme for fence blocks in vitepress,
instead of the default `material-palenight` theme.
This increases the contrast ratio of `#comments` from 2.75:1 to 4.43:1,
which is a lot more visible.
It still doesn't reach WCAG 2.0 level AA contrast standards,
which requires 4.5:1 as a minimum constrast ratio, but 4.43:1 is
pretty close, and we don't need to manually modify the theme's colours.
2022-11-17 19:05:41 +00:00
Alois Klink
6da6edfc01
refactor(docs): use default vitepress highlighter
...
Use the default vitepress highlighter instead of making our own
highlighter using shiki.
The benefits are:
- We don't need to directly depend on shiki
- `mermaid-example` code-blocks will use the same highlighting
as other languages (e.g. `html`/`js`).
- We can control the theme from the global `vitepress` config.
- Darkmode/lightmode themes are supported
- Escaping is already handled by the default highlight function
2022-11-17 19:05:38 +00:00
Sidharth Vinod
461236030c
Merge pull request #3798 from weedySeaDragon/bug/1952-stateDiagram--classDef-fix-classes-type
...
bug: State diagram fix classes type
2022-11-17 22:01:09 +05:30
Sidharth Vinod
b83ba4d293
fix: Move redirection to router
2022-11-17 11:14:15 +05:30
Alois Klink
476917bda9
Revert "chore(deps): pin dependencies"
...
This reverts commit 17b72d565d
.
2022-11-16 20:00:16 +00:00
Ashley Engelund (weedySeaDragon @ github)
0d9566dd71
diagrams: use a11y title,desc specific method (was renamed)
2022-11-15 13:48:35 -08:00
Ashley Engelund (weedySeaDragon @ github)
8d96518092
accessibility.js -> ts; + set aria-roledescription; add spec
2022-11-15 13:47:16 -08:00
Ashley Engelund (weedySeaDragon @ github)
717aca6824
change shiki getHighlighter import
2022-11-15 13:09:16 -08:00
Ashley Engelund (weedySeaDragon @ github)
2cbf6110a6
create separate spec for stateRenderer-v2
2022-11-15 12:30:10 -08:00
Sidharth Vinod
d05fd25339
Fix #3799 : Remove type
from package.json
2022-11-15 23:59:17 +05:30
Ashley Engelund (weedySeaDragon @ github)
fcec9adbcd
diagramStates should not be global; pass it into functions; minor comment fixes
2022-11-15 09:19:27 -08:00
Ashley Engelund (weedySeaDragon @ github)
13f3008f82
diagramClasses no longer needs to be cached; mermaidAPI no longer calls it repeatedly
2022-11-15 09:18:10 -08:00
Ashley Engelund (weedySeaDragon @ github)
6090a1f65a
(minor) import expectTypeOf in spec
2022-11-15 09:14:00 -08:00
Ashley Engelund (weedySeaDragon @ github)
1ecd4a551d
(minor) fix JSdoc tag
2022-11-15 09:13:27 -08:00
Ashley Engelund (weedySeaDragon @ github)
c6db0524bd
+ spec stateRenderer-v2.js getClasses() to verify it returns a {}
2022-11-15 09:01:34 -08:00
Ashley Engelund (weedySeaDragon @ github)
d3f5474f38
(minor) fix JSdoc types in comments
2022-11-15 08:59:01 -08:00
Ashley Engelund (weedySeaDragon @ github)
9996e53e24
(minor) add comments, remove duplicated line
2022-11-15 08:50:20 -08:00
Knut Sveidqvist
3b79ee35e0
Merge pull request #3780 from mermaid-js/sidv/mergeMaster
...
chore: Merge master to develop
2022-11-15 12:47:32 +01:00
Sidharth Vinod
b202b539bf
Merge pull request #3765 from spier/feature/check-links-in-docs
...
Add GHA that will check links + Fix broken links
2022-11-15 14:17:18 +05:30
Sidharth Vinod
18c27c6f1d
chore: Add docs to redirect.ts
2022-11-15 11:13:54 +05:30
Ashley Engelund (weedySeaDragon @ github)
345eaade22
stateDB classes must be a {} not []
2022-11-14 11:39:58 -08:00
Sidharth Vinod
82f63b056f
feat: Redirect old documentation links.
2022-11-15 01:06:04 +05:30
Ashley Engelund (weedySeaDragon @ github)
ccd55a0bde
add stateDiagram-v2 to list of graphs with classDefs
2022-11-14 11:24:59 -08:00
Sidharth Vinod
846a03663c
fix(docs): ClassDiagram table
2022-11-14 22:15:34 +05:30
Sidharth Vinod
a88a467d45
sync
2022-11-14 22:14:27 +05:30
Sidharth Vinod
beab2278d8
feat: Async mermaid docs
2022-11-14 22:06:26 +05:30
Per Brolin
51a84eeb90
Merge branch 'develop' of github.com:mermaid-js/mermaid into develop
2022-11-14 16:34:57 +01:00
Per Brolin
f36cf5b321
Merge branch 'master' of github.com:mermaid-js/mermaid
2022-11-14 13:02:03 +01:00
Sidharth Vinod
eae88c51d2
Cleanup
2022-11-14 16:42:08 +05:30
Sidharth Vinod
051b4271d3
Cleanup docs
2022-11-14 15:24:47 +05:30
Sidharth Vinod
4decaf0308
chore: Fix tsdoc
2022-11-14 15:17:13 +05:30
Sidharth Vinod
9144fa390f
cleanup
2022-11-14 15:05:58 +05:30
Sidharth Vinod
77a326dedf
Merge Master
2022-11-14 14:51:23 +05:30
Per Brolin
82ac667535
Service functions added
2022-11-14 10:03:24 +01:00
Sidharth Vinod
2d9bdedaf5
Merge branch 'develop' into sidv/mergeMaster
...
* develop:
chore(deps): update all non-major dependencies
fix(deps): update all non-major dependencies
fix: `sourceLinkTemplate` in typedoc
only call getClasses if the diagram renderer supports it
fix typo
merge fix: get classDefs only if diagram is in CLASSDEF_DIAGRAMS
use lodash isEmpty instead of method defined in utils
chore: Fix cspell
fix: Type of DiagramStyleClassDef, general cleanup
change spec descriptions to active voice (= shorter b/c 'should' isn't needed)
functions and specs: removeExistingElements
functions and specs: createUserstyles; minor changes
functions and specs: createCssStyles, appendDivSvgG,cleanUpSvgCode, putIntoIFrame [for render]
add MockedD3.ts
const isSandboxed, isLooseSecurityLevel, fontFamily; a few more CONSTs
more meaningful var names; move related lines together; const idSelector
comment the main steps (prepare to break into functions that can be tested)
render: define const iFrameId, enclosingDivID and _selector to use in function
specs: encodeEntities, decodeEntities
render: constants
2022-11-14 13:57:09 +05:30
Sidharth Vinod
0763590c24
Merge pull request #3791 from mermaid-js/renovate/all-minor-patch
...
chore(deps): update all non-major dependencies (minor)
2022-11-14 13:18:10 +05:30
Knut Sveidqvist
dfb1440ae0
Merge pull request #3684 from weedySeaDragon/chore/3648-mermaidAPI-render--dry-cleanup-specs
...
chore: clean up code in mermaidAPI render() and write specs/tests
2022-11-14 08:42:25 +01:00
renovate[bot]
a1e2df8466
chore(deps): update all non-major dependencies
2022-11-14 05:28:23 +00:00
renovate[bot]
20613beb8a
fix(deps): update all non-major dependencies
2022-11-14 05:25:07 +00:00
Sidharth Vinod
ab92b5c100
chore: Cleanup pakage.json, fix jisonLint
2022-11-11 01:54:29 +05:30
Sidharth Vinod
a83f88bdf1
chore: Merge master to develop
2022-11-10 13:51:53 +05:30
Knut Sveidqvist
c781545a40
#3778 Adding a hexgon shape
2022-11-09 20:10:31 +01:00
Sidharth Vinod
791dbe01a2
fix: sourceLinkTemplate
in typedoc
2022-11-09 23:48:26 +05:30
Sidharth Vinod
0af36f12b7
feat: Switch CDN
2022-11-09 22:38:21 +05:30
Ashley Engelund (weedySeaDragon @ github)
750029f557
merge MERMAID/develop
2022-11-09 07:45:22 -08:00
Per Brolin
ccfaea8e3f
Updated README-files
2022-11-09 16:34:31 +01:00
Per Brolin
526113517b
Updated release
2022-11-09 16:20:28 +01:00
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