0c4edd332c
Ran linter (npm run lint:fix)
2022-10-19 20:06:54 +02:00
904c011baf
Merge remote-tracking branch 'origin/develop' into develop
2022-10-19 14:33:55 +02:00
352dd5dcf7
testcode
2022-10-19 14:32:28 +02:00
c71b6e31f7
Merge branch 'develop' into feat/3601-cspell-configuration
2022-10-18 21:02:38 +05:30
20751a6496
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
2022-10-17 13:20:17 -04:00
75e11b1fde
add basic render (cypress) test for classDiagram-v2 too
2022-10-17 12:33:23 -04:00
cead1f36f4
add basic render (cypress test for notes
2022-10-17 12:13:22 -04:00
3108e896b6
add renedering (cypress) tests
2022-10-17 12:03:51 -04:00
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
1f642ca9b6
Merge branch 'develop' into feat/3601-cspell-configuration
2022-10-15 19:48:08 +05:30
478c387491
added words to cspell ignore words list, removed mywords.txt
2022-10-15 19:43:07 +05:30
4be66554b3
#3659 Adding height when not using maxWidth
2022-10-13 14:26:05 +02:00
d1f3b889d6
add cypress tests for classDefs and applying classes to states
2022-10-11 08:33:43 -07:00
e876c35ef9
Merge pull request #3591 from mermaid-js/sidv/fixDetectDiagram
...
fix Detect diagram fallback
2022-10-10 13:43:41 +02:00
6e2deb1fa7
fix: Fix eslint warnings
2022-10-09 22:08:32 +08:00
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
646f76d343
Fix for broken test
2022-10-07 14:36:25 +02:00
047e15951a
Fix for issue in classdiagram-v2 from the typescript updates
2022-10-07 12:17:35 +02:00
802407c8ae
Merge remote-tracking branch 'origin/develop' into lazy-load-import
2022-10-07 10:46:16 +02:00
439274c5ae
chore: Cleanup
2022-10-07 10:40:01 +02:00
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
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
3e3de72093
fix: dynamic import
2022-10-07 14:51:37 +08:00
9f286b46ff
fix: Filename in viewer.js
2022-10-06 23:39:30 +08:00
1615c6d9f9
fix #3391 : Remove flowchart as fallback for diagram detection.
2022-10-06 19:14:25 +08:00
d59f878020
fix: use async in render-after-error
2022-10-06 17:49:10 +08:00
c919bef70e
fix: Import diagram
2022-10-06 13:47:00 +08:00
0f2e0c2ab4
Updated logic for diagram loading
2022-10-05 22:03:05 +02:00
c05c98c082
WIP
2022-10-05 13:14:05 +02:00
f9753fc621
chore: Update test URL
2022-10-05 16:04:26 +08:00
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
74bd576ebc
fix(mermaid): Add await to render in init.
2022-10-05 14:52:04 +08:00
a017ffc3c9
fix(test): Rerender
2022-10-05 14:08:53 +08:00
d3a81f025a
chore(tests): Interaction - cleanup
2022-10-04 16:59:05 +08:00
750f647b0d
fix(tests): Interaction - Security strict, other
2022-10-04 16:55:46 +08:00
2a9e56439e
fix(tests): Interaction test - Security loose.
2022-10-04 16:37:37 +08:00
8ee321fd7b
#3561 Adding cScale0-11 etc and usage of the colors from the mindmap diagram
2022-10-03 14:51:13 +02:00
0a2804c641
Mindmap cleanup
2022-10-03 11:08:55 +02:00
5079fa93b4
Using cose-bilkent layout algorithm for mindmaps
2022-10-03 10:05:12 +02:00
56add0756f
Lazy loading fix for example-diagram and mindmaps
2022-10-03 07:01:56 +02:00
6ebfbb2f9e
Arrow tip aligned to edge of box
2022-09-29 20:37:57 +02:00
f46f8752ca
Adding example diagram as a template for a new diagram
2022-09-28 17:49:47 +02:00
053a20bd33
Returning the borders to the e2e tests
2022-09-28 15:33:33 +02:00
f60c7fff65
Merge branch 'develop' into 3061_making_a_monorepo
2022-09-28 14:26:07 +02:00
fe8df78322
Clarification in the docs regarding directions in the subgraps for flowcharts.
2022-09-28 12:32:58 +02:00
982c1b4979
#3061 Lazy loading auto derived path
2022-09-26 14:22:21 +02:00
a928120bec
#3061 Log handing and other fixes, error handling in diagram creation
2022-09-26 10:44:18 +02:00
9566f51ca8
Commiton issue #3061 Injecting mermaid utilities in registered diagram
2022-09-26 08:01:23 +02:00
af2b1945a3
Detector registering itself on load
2022-09-23 16:55:30 +02:00
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
8c63d002e7
fix: js-base64
...
Co-authored-by: Alois Klink <alois@aloisklink.com>
2022-09-23 16:53:11 +05:30
bc0be28f08
fix: js-base64
...
Co-authored-by: Alois Klink <alois@aloisklink.com>
2022-09-23 15:54:24 +05:30
eaa1602b1a
fix: json import, js-base64
...
Co-authored-by: Alois Klink <alois@aloisklink.com>
2022-09-23 15:42:41 +05:30
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
9e35bf6e6f
fix: tests
2022-09-23 10:40:56 +05:30
aeb31fe1ae
Use vite for build
2022-09-22 15:35:22 +05:30
0e0a6c0f69
Fixed paths for dev server
2022-09-22 11:28:37 +02:00
dab43da202
fix: imports in HTML
2022-09-20 22:13:49 +05:30
a266a9c539
Merge pull request #3479 from elliot-nelson/enelson/git-cherry-pick-tag
...
feat(git): cherry-pick keyword supports tag attribute
2022-09-20 17:38:01 +02:00
7635db4c1e
Merge pull request #3454 from mermaid-js/3409_Truncated_Tags
...
3409 Fix for truncated tags in GitGraph
2022-09-19 08:28:41 +02:00
4e4b5ccf8d
feat(git): allow cherry-pick to suppress tag altogether
2022-09-18 09:22:35 -04:00
ae920eaa93
feat(git): cherry-pick keyword supports tag attribute
2022-09-17 23:57:32 -04:00
e8eb2ab03f
Merge pull request #3459 from aloisklink/chore/update-cypress
...
Update Cypress to v10 and fix E2E errors
2022-09-16 17:32:10 +01:00
9c88c785cb
Fix for issues in errorhandling and class diagrams after refactoring
2022-09-16 14:05:15 +02:00
4c5d813e58
Fixed Linting issues
2022-09-16 09:25:22 +02:00
539ee49594
Merge remote-tracking branch 'origin/release/9.1.7' into sidv/mergeRelease
...
* origin/release/9.1.7:
Release 9.1.7
Fix for broken rendering test
Fix for issue #3428 , load the configured diagrams even when initialize has not been called.
2022-09-14 11:11:12 +05:30
625ec813b9
chore: upgrade cypress to v10
...
Cypress v10 had some minor breaking changes,
(e.g. the cypress/plugins folder dissapeared)
so I had to change some things.
It looks like the Cypress was previously reverted in [dee9cfedee9cfea85
2022-09-14 04:15:52 +01:00
595f7680e9
fix(flowchart-v2): fix arrowMarkerAbsolute=true
...
The if-check for arrowMarkerAbsolute in the flowchart-v2 code is in
dagre-wrapper. Unfortunately, I can't seem to find a way to find the
local conf (e.g. the one set via `flowRenderer.setConf()`, so instead
I'm using global mermaid config from `src/config`.
Flowchart v1 arrowMarkerAbsolute=true is still broken, but I'm not
really sure how to fix that.
2022-09-14 04:15:52 +01:00
6e7037bafd
test(e2e): fix most arrowMarkerAbsolute tests
...
The arrows between flowcharts do not have the class edgePath.
Instead, I'm loading all `<path>`s within the `<g class='edgePaths'>`
2022-09-14 04:15:52 +01:00
a25c9a30d0
text(e2e): give git tests consistent commit id
...
gitGraph render tests are currently using random commit ids,
which causes visual regression tests to fail.
I couldn't find a way to make the random commit IDs consistent
(JavaScript/Cypress doesn't seem to have a random.seed() function),
so I've just hardcoded all the commit ids.
2022-09-14 04:15:52 +01:00
05b8a6e77f
test(e2e): widen flowchart width to within 10%
...
Widen flowchart width acceptable values to within 10% of 300px.
On my local environment, I'm getting 283px, which is 5.5% of 300px.
2022-09-14 04:15:52 +01:00
f05c790248
test(e2e): fix failing xss9 test
...
Fixes xx9 test to continue running even if JavaScript throws an
exception.
2022-09-14 04:15:52 +01:00
d60ce53e05
#3409 Fixed the truncated tags issue
2022-09-13 18:23:24 +02:00
fc9d22562b
Creating detectors and moving out diagram specific code from the diagramAPI
2022-09-10 15:53:50 +02:00
9d0901801b
Suppress errors
2022-09-09 18:26:57 +05:30
47490e9820
Lint fixes
2022-09-05 15:57:12 +02:00
df7b5965c2
Merge branch 'develop' into minmaps
2022-09-05 15:35:24 +02:00
8ad5f728c0
Removing requirement to add ids for nodes with a shape
2022-09-05 14:53:01 +02:00
8b4a08eef4
#3336 Merged typescript changes
2022-09-05 14:04:39 +02:00
01106caa59
Merged typescript changes
2022-09-05 11:22:17 +02:00
047b7023a2
Updated with cloud and bang shapes
2022-09-05 09:54:00 +02:00
98e9f5751a
Prettier pass
2022-09-05 01:00:47 +05:30
41dec4d159
Fix XSS htmls
2022-09-05 00:57:34 +05:30
91478caf5b
fix #3407 Replace `div` with `pre` and format
2022-09-05 00:48:36 +05:30
5584fef1b0
#3395 Renabling the error graph which is rendered on error
2022-09-02 14:05:31 +02:00
ccb16e5f5a
Adding cloud and bang shapes
2022-09-02 11:08:26 +02:00
ac76fb73a8
Merge pull request #3360 from vallsv/feature-ms-duration
...
Feature decimal duration in second for gantt diagram
2022-09-01 16:23:42 +02:00
68f8010ab9
Merge branch 'develop' into minmaps
2022-09-01 13:42:21 +02:00
63c385a5d7
Adding some rendering tests
2022-08-30 21:36:17 +02:00
a93f37a3fc
#3238 Updated documentation
2022-08-30 19:25:22 +02:00
dd40b19c89
#3238 Added more rendering test cases
2022-08-30 18:37:13 +02:00
d7e0888801
Merge pull request #3361 from aloisklink/feature/3356_git_custom_merge_commit_id
...
feat(git): allow custom merge commit ids
2022-08-30 17:50:57 +02:00
4cdc6e4a0d
Merge branch 'minmaps' of github.com:mermaid-js/mermaid into minmaps
2022-08-28 14:25:15 +02:00
f350ff9852
Merge branch 'minmaps' of github.com:mermaid-js/mermaid into minmaps
2022-08-28 14:25:02 +02:00
6ab0eef6f3
Merge branch 'develop'
...
Conflicts:
cypress/platform/knsv.html
2022-08-28 14:22:56 +02:00
080bde0bc2
#2824 Updated regressionstest afters diagram sizing changes
2022-08-28 11:39:22 +02:00
e6e7bdcb55
#2824 Size changes and updated regressionstest afters diagram sizing changes
2022-08-28 11:25:09 +02:00
2968b400c4
Updated viewBox settings
2022-08-27 15:03:29 +02:00
d0d5739ab0
Merge branch 'develop' into minmaps
2022-08-27 12:35:30 +02:00
0779c39654
Border
2022-08-27 12:32:33 +02:00
Jeroen Ekkelkamp