GitHub/mermaid
1
0
Fork 0
mirror of https://github.com/mermaid-js/mermaid.git synced 2025-01-28 07:03:17 +08:00
Code Issues Projects Releases Wiki Activity
5,590 Commits 180 Branches 159 Tags
Commit Graph

5590 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ashley Engelund (weedySeaDragon @ github)
eb1c6894f5 change demo ER diagram to include attributes, names with various chars 2022-09-24 16:05:59 -07:00
Ashley Engelund (weedySeaDragon @ github)
91091c614f store and reference entity by unique id, not name (elements, graph, etc.) 2022-09-24 16:05:20 -07:00
Ashley Engelund (weedySeaDragon @ github)
481b5cde0f (minor) fix ==; remove unused imports; fix typos; add comments 2022-09-24 16:02:55 -07:00
Ashley Engelund (weedySeaDragon @ github)
d328879329 add uuid; graph node ids can no longer be based on entity names; make unique id 2022-09-24 15:40:02 -07:00
Ashley Engelund (weedySeaDragon @ github)
3c1bad1792 er jison: allow more chars in Entity name; clean up spec 2022-09-24 15:38:06 -07:00
Ashley Engelund (weedySeaDragon @ github)
9ec935f109 add ts-ignore for jison in vite.config.cts 2022-09-23 11:35:31 -07:00
Ashley Engelund (weedySeaDragon @ github)
4bedc49b4d define ENTITY_NAME that allows some non-alphanumeric chars; spec re-arrange 2022-09-23 11:34:52 -07:00
Ashley Engelund (weedySeaDragon @ github)
338ba704ba Merge remote-tracking branch 'MERMAID/develop' into develop 2022-09-22 23:28:24 -07:00
Sidharth Vinod
dc53b2fde3
Merge pull request #3509 from pje/feature/3507_vscode_debug_test 
Add "Debug Current Test File" configuration for VSCode
 2022-09-23 10:13:00 +05:30
Sidharth Vinod
98d214fd60
chore: Add recommended extensions 2022-09-23 10:11:19 +05:30
Sidharth Vinod
adadc9ee26
Merge pull request #3510 from lishid/patch-2 
Fix user-journey leaking css
 2022-09-23 09:58:50 +05:30
Lishid
6309300eb6
Fix user-journey leaking css 
This fixes a CSS syntax error that causes the CSS parser to soft-fail, which leads to the later CSS (custom styles) to not properly append the `#id` to them.
 2022-09-22 12:48:23 -04:00
Patrick Ellis
0dce8f4104
Add "Debug Current Test File" configuration for VSCode 
Just press F5 (or ⌘+⇧+P -> `Debug Current Test File`)
"
 2022-09-22 12:33:09 -04:00
Ashley Engelund (weedySeaDragon @ github)
395cc29701 Merge remote-tracking branch 'MERMAID/develop' into develop 2022-09-21 09:29:28 -07:00
Sidharth Vinod
c93c7c75c9
Fix docs 2022-09-21 17:10:29 +05:30
Knut Sveidqvist
24ef5f9fe4 Auto stash before merge of "develop" and "origin/develop" 2022-09-21 10:08:52 +02:00
Knut Sveidqvist
d08882d043
Merge pull request #3427 from mermaid-js/sidv/vitest 
Vitest
 2022-09-21 10:07:18 +02:00
Knut Sveidqvist
eea31a1046
Merge pull request #3498 from sidharthv96/sidv/parallelE2E 
[DevOps] Parallel E2E
 2022-09-21 09:15:07 +02:00
Sidharth Vinod
5d085fd3f6
Merge branch 'develop' into sidv/vitest 
* develop:
  chore(deps-dev): bump esbuild from 0.15.6 to 0.15.8
 2022-09-21 12:18:11 +05:30
Sidharth Vinod
30e2b08028
vite -> cts 2022-09-21 12:16:59 +05:30
Sidharth Vinod
533da47516
Merge branch 'develop' into sidv/vitest 
* develop: (28 commits)
  fix(docs): update link
  Revert "unify Jison tranformers"
  Update yarn.lock
  Revert "fix(test): No esm exports"
  fix(test): No esm exports
  fix(docs): `mmd` detection
  Hope this fails
  unify Jison tranformers
  Fix jest
  Remove `docs:build` from postbuild.
  Add verification log
  This should fail CI
  fix: imports in HTML
  Revert "Add diagramAPI to outfile"
  Add `type: module` to package.json
  chore(deps-dev): bump @types/lodash from 4.14.184 to 4.14.185
  Update integrations.md
  Add vitepress pluin
  Update mermaid version
  Fix ports
  ...
 2022-09-21 12:15:45 +05:30
Knut Sveidqvist
146c2e2dd9
Merge pull request #3490 from mermaid-js/dependabot/npm_and_yarn/develop/esbuild-0.15.8 
chore(deps-dev): bump esbuild from 0.15.6 to 0.15.8
 2022-09-21 08:45:08 +02:00
Sidharth Vinod
065756a90d
Merge branch 'develop' into sidv/parallelE2E 
* develop: (28 commits)
  fix(docs): update link
  Revert "unify Jison tranformers"
  Update yarn.lock
  Revert "fix(test): No esm exports"
  fix(test): No esm exports
  fix(docs): `mmd` detection
  Hope this fails
  unify Jison tranformers
  Fix jest
  Remove `docs:build` from postbuild.
  Add verification log
  This should fail CI
  fix: imports in HTML
  Revert "Add diagramAPI to outfile"
  Add `type: module` to package.json
  chore(deps-dev): bump @types/lodash from 4.14.184 to 4.14.185
  Update integrations.md
  Add vitepress pluin
  Update mermaid version
  Fix ports
  ...
 2022-09-21 12:06:18 +05:30
Sidharth Vinod
6819fc05da
add lcov 2022-09-21 12:02:28 +05:30
dependabot[bot]
bc14d56568
chore(deps-dev): bump esbuild from 0.15.6 to 0.15.8 
Bumps [esbuild](https://github.com/evanw/esbuild) from 0.15.6 to 0.15.8.
- [Release notes](https://github.com/evanw/esbuild/releases)
- [Changelog](https://github.com/evanw/esbuild/blob/master/CHANGELOG.md)
- [Commits](https://github.com/evanw/esbuild/compare/v0.15.6...v0.15.8)

---
updated-dependencies:
- dependency-name: esbuild
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-09-21 06:18:23 +00:00
Knut Sveidqvist
01ca1cc8c7
Merge pull request #3493 from sidharthv96/sidv/testDocLint 
Fix CI `docs:lint`
 2022-09-21 08:15:13 +02:00
Knut Sveidqvist
f69ead5e08
Merge pull request #3489 from mermaid-js/dependabot/npm_and_yarn/develop/types/lodash-4.14.185 
chore(deps-dev): bump @types/lodash from 4.14.184 to 4.14.185
 2022-09-21 08:11:45 +02:00
Knut Sveidqvist
f29974628b
Merge pull request #3476 from emersonbottero/patch-1 
Add vitepress plugin
 2022-09-21 08:10:27 +02:00
Knut Sveidqvist
ad2d098b52
Merge pull request #3452 from mermaid-js/sidv/removeWebpackBabel 
Remove webpack & babel
 2022-09-21 08:10:10 +02:00
Sidharth Vinod
247061919b
fix(docs): update link 2022-09-21 11:17:03 +05:30
Sidharth Vinod
0c308134a9
Merge branch 'develop' into sidv/vitest 
* develop: (23 commits)
  Revert #3475
  chore: updyaate browsers list
  Support EMPTYSTR in jison parser, add unit tests for git graph parser
  Use undefined to mean default tagging behavior
  feat(git): allow cherry-pick to suppress tag altogether
  Update src/diagrams/git/parser/gitGraph.jison
  fix(git): fix cherry-pick regex parsing error
  test(git): add basic parsing test for cherry-pick
  feat(git): cherry-pick keyword supports tag attribute
  ci(e2e-applitols): add applitools CI action
  Test docs:verify
  Cleanup docs
  Fixed Linting issues
  ci(e2e): re-enable e2e tests
  style: fix .github/workflow/e2e styling
  chore: upgrade cypress to v10
  fix(flowchart-v2): fix arrowMarkerAbsolute=true
  test(e2e): fix most arrowMarkerAbsolute tests
  text(e2e): give git tests consistent commit id
  test(e2e): widen flowchart width to within 10%
  ...
 2022-09-21 11:11:46 +05:30
Sidharth Vinod
3982d19e57
Merge branch 'develop' into sidv/removeWebpackBabel 
* develop:
  Revert #3475
  ci(e2e-applitols): add applitools CI action
 2022-09-21 11:04:35 +05:30
Sidharth Vinod
55d706323d
CI Concurrency 4 2022-09-21 10:42:27 +05:30
Sidharth Vinod
51df0a68cc
Remove build 2022-09-21 10:41:47 +05:30
Sidharth Vinod
ca053e0a11
Parallel e2e 2022-09-21 10:36:38 +05:30
Sidharth Vinod
c260f7c20b
Revert "unify Jison tranformers" 
This reverts commit 135f2cc2fdd8da4810f085c6293fa0e95bf5b025.
 2022-09-21 10:12:29 +05:30
Sidharth Vinod
9f0137a34d
Update yarn.lock 2022-09-21 10:05:57 +05:30
Sidharth Vinod
e0aae3e31f
Revert "fix(test): No esm exports" 
This reverts commit c21c026749890990482f5f80993a86a3d1c5eef6.
 2022-09-20 23:12:51 +05:30
Sidharth Vinod
c21c026749
fix(test): No esm exports 2022-09-20 23:10:05 +05:30
Sidharth Vinod
b9cb7e9898
fix(docs): mmd detection 2022-09-20 23:01:05 +05:30
Ashley Engelund (weedySeaDragon @ github)
1ea546a0a5 Merge remote-tracking branch 'MERMAID/develop' into develop 
# Conflicts:
#	src/diagrams/git/gitGraphParserV2.spec.js
 2022-09-20 10:25:18 -07:00
Sidharth Vinod
ffdf268ba2
Merge branch 'develop' into sidv/testDocLint 
* develop:
  ci(e2e-applitols): add applitools CI action
 2022-09-20 22:52:02 +05:30
Sidharth Vinod
f34008b71a
Merge branch 'develop' into sidv/testDocLint 
* develop:
  Revert #3475
 2022-09-20 22:51:12 +05:30
Sidharth Vinod
8f009ed815
Hope this fails 2022-09-20 22:50:39 +05:30
Knut Sveidqvist
71d252f706
Merge pull request #3483 from aloisklink/ci/add-applitools-action 
ci(e2e-applitols): add applitools CI action
 2022-09-20 19:19:34 +02:00
Sidharth Vinod
135f2cc2fd
unify Jison tranformers 2022-09-20 22:46:27 +05:30
Sidharth Vinod
b83f18327a
Fix jest 2022-09-20 22:44:49 +05:30
Sidharth Vinod
d5fc319d4e
Remove docs:build from postbuild. 2022-09-20 22:42:05 +05:30
Sidharth Vinod
c343e4a1e3
Add verification log 2022-09-20 22:31:53 +05:30
Sidharth Vinod
b72dad9c5b
Revert #3475 
Was an accidental merge.
 2022-09-20 22:23:59 +05:30