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,379 Commits 180 Branches 159 Tags
Commit Graph

5379 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sidharth Vinod
8b534440a0
Merge pull request #3420 from weedySeaDragon/docs/3418_auto_generated_comment_html_files 
Docs: add '..auto generated..' to .html documentation files
 2022-09-12 21:52:40 +05:30
Ashley Engelund
7f56112f8e
change wording of console log message (use comma) 
Co-authored-by: Sidharth Vinod <sidharthv96@gmail.com>
 2022-09-12 09:17:40 -07:00
Knut Sveidqvist
0edc2751f3
Merge pull request #3436 from mermaid-js/3061_decoupling 
Creating detectors and moving out diagram specific code from the diag…
 2022-09-12 12:56:55 +02:00
Knut Sveidqvist
06365faef3 Moving out tests from mermaid.spec.js 2022-09-12 11:24:58 +02:00
Knut Sveidqvist
885e69c809 Fix for issue with setting the loglevel via numbers 2022-09-12 10:53:45 +02:00
Knut Sveidqvist
9ef50d7a93 Merge branch 'develop' into 3061_decoupling 2022-09-12 10:47:45 +02:00
mmorel-35
ca5fbb7fa8 chore: update browsers list 2022-09-12 07:20:57 +00:00
Knut Sveidqvist
7a8a9ca5b0
Merge pull request #3438 from aloisklink/fix/3362_support-branch-names-that-start-with-branch 
fix(git): support unusual prefixes in branch name
 2022-09-12 08:55:19 +02:00
Knut Sveidqvist
9e5e7b31e9 Limiting the interaction between the mermaid diagram and Mermaid to the diagramAPI 2022-09-12 08:51:52 +02:00
Knut Sveidqvist
213309f5e2 Fix for broken tests 2022-09-12 07:41:56 +02:00
Sidharth Vinod
bfa69aa084
chore(docs): Remove edit this page 2022-09-12 10:55:13 +05:30
Alois Klink
1527956669
fix(git): support unusual prefixes in branch name 
jison throws an error if a branch name starts with an unusual prefix.

For example, a branch named `branch/test-branch` will throw a
parse error, since jison thinks it's a `branch` command, and not
a branch id.

An easy fix is to use the `(?=\s|$)` regex to ensure that only
'branch ' or 'branch\n' will be parsed as the branch command.

Fixes: https://github.com/mermaid-js/mermaid/issues/3362
 2022-09-11 22:52:02 +01:00
Ashley Engelund (weedySeaDragon @ github)
9cc7da09fc formatting 2022-09-11 14:10:34 -07:00
Ashley Engelund (weedySeaDragon @ github)
6ad9208119 eslint fixes 2022-09-11 11:37:23 -07:00
Knut Sveidqvist
fc9d22562b Creating detectors and moving out diagram specific code from the diagramAPI 2022-09-10 15:53:50 +02:00
Ashley Engelund (weedySeaDragon @ github)
ad56a22277 Merge remote-tracking branch 'MERMAID/develop' into docs/3418_auto_generated_comment_html_files 
# Conflicts:
#	src/docs.mts
 2022-09-09 18:48:21 -07:00
Ashley Engelund (weedySeaDragon @ github)
8ca91d6303 add eslint-disable no-console for file 2022-09-09 18:32:26 -07:00
Sidharth Vinod
9d0901801b
Suppress errors 2022-09-09 18:26:57 +05:30
Knut Sveidqvist
f63acea34a
Merge pull request #3393 from mermaid-js/sidv/typescript 
Introduce stricter typescript linting
 2022-09-09 14:51:33 +02:00
Sidharth Vinod
5a1e3ed5c6
Merge branch 'develop' into sidv/typescript 
* develop: (67 commits)
  fix: Tsconfig
  Update prettier
  chore: Run postbuild with prepare
  (formatting) prettier fix
  Removed warnings in the grammar oand some console logging
  ci: lint .jison files for any console.log()
  fix JSDOC @param, @returns; fixed a few minor typos in comments
  unmangle sentence about doc changes committed and showing up on docsify site
  change references from /docs to /src/docs; rework doc section in CONTRIBUTING
  Update after lint comments
  Regenerate the directive docs as I changed them
  chore(deps-dev): bump typescript from 4.7.4 to 4.8.2
  Update duplicate copy pasted directive description
  chore(deps-dev): bump @types/dompurify from 2.3.3 to 2.3.4
  chore(deps-dev): bump jest-environment-jsdom from 29.0.1 to 29.0.2
  chore(deps-dev): bump babel-jest from 29.0.1 to 29.0.2
  Lint fixes
  Removing requirement to add ids for nodes with a shape
  #3336 Merged typescript changes
  Merged typescript changes
  ...
 2022-09-09 18:12:41 +05:30
Knut Sveidqvist
d78adc6fb9
Merge pull request #3367 from dbartholomae/add_tests_for_C4_system_context_macros 
Add tests for C4 system context macros
 2022-09-09 09:35:51 +02:00
Sidharth Vinod
2611a430b9
Merge pull request #3405 from aloisklink/other/3339_forbid-console-in-src-code 
style: forbid using `console` in mermaid src code
 2022-09-09 08:32:55 +05:30
Sidharth Vinod
f8eaccb4c1
fix: Run precommit hook for doc.mts changes too 2022-09-08 21:54:51 +05:30
Sidharth Vinod
b0559df903
chore: Updated doc files 2022-09-08 21:52:41 +05:30
Sidharth Vinod
2826bf6823
fix: Formatting issue 2022-09-08 21:51:42 +05:30
Ashley Engelund (weedySeaDragon @ github)
9acf63f7d6 (formatting only) sort imports just to force a new CI lint check 2022-09-08 07:44:36 -07:00
Ashley Engelund (weedySeaDragon @ github)
fd567f833e (minor) clarify var names (file -> filename); comments 2022-09-07 14:15:54 -07:00
Ashley Engelund (weedySeaDragon @ github)
6376c9ae43 switch order of params so the last one can be omitted 2022-09-07 14:15:09 -07:00
Ashley Engelund (weedySeaDragon @ github)
48b0076ea5 Merge remote-tracking branch 'MERMAID/develop' into docs/3418_auto_generated_comment_html_files 2022-09-07 14:04:56 -07:00
Sidharth Vinod
a800cb6fe6 Update prettier 2022-09-07 14:04:35 -07:00
Sidharth Vinod
5f81e3d5ed chore: Run postbuild with prepare 
As postbuild was not running with prepare, PR that updated `documentation` package was green,  although it should've failed.
 2022-09-07 14:04:35 -07:00
Ashley Engelund (weedySeaDragon @ github)
e690da638d (formatting) prettier fix 2022-09-07 14:04:35 -07:00
Ashley Engelund (weedySeaDragon @ github)
be28160a4a unmangle sentence about doc changes committed and showing up on docsify site 2022-09-07 14:04:35 -07:00
Ashley Engelund (weedySeaDragon @ github)
d18624bbe9 change references from /docs to /src/docs; rework doc section in CONTRIBUTING 2022-09-07 14:04:35 -07:00
Ashley Engelund (weedySeaDragon @ github)
7fe8f260fc minor cleanup, clarify var names, add @todos 2022-09-07 14:04:35 -07:00
Ashley Engelund (weedySeaDragon @ github)
73abcd869c fix: also check other files 2022-09-07 14:04:35 -07:00
Ashley Engelund (weedySeaDragon @ github)
d0074356e9 fix: cannot use __dirname with .mts and latest Node 2022-09-07 14:04:35 -07:00
Alois Klink
6e81ee9d97
Merge branch 'develop' into other/3339_forbid-console-in-src-code 
Fixes merge conflict in:
  - .eslintrc.json due to 6167eda6b6e5566469ed88b8850aa04e427bd245
  - lint.yml due to 5674f8e6758f4628c78389b4380ecbe233045146
 2022-09-07 21:00:42 +01:00
Sidharth Vinod
3986f48199
fix: Tsconfig 2022-09-08 00:34:52 +05:30
Ashley Engelund (weedySeaDragon @ github)
c6ce5a80fa fix: pass in doCopy param 2022-09-07 11:00:59 -07:00
Ashley Engelund (weedySeaDragon @ github)
411d641aa2 simplfy method to copy transformation to /docs; extract logging 
Extract the logging so that it if later we want to turn it on/off with a --verbose flag
 2022-09-07 08:35:51 -07:00
Ashley Engelund (weedySeaDragon @ github)
a878edfb9b add and use constants; DRY glob patterns in main 2022-09-07 08:32:52 -07:00
Ashley Engelund (weedySeaDragon @ github)
1a0fe0abf6 (comments only) reword main docblock; clarify other comments; grammar etc. fixes 2022-09-07 08:30:13 -07:00
Sidharth Vinod
e310af7673
Update prettier 2022-09-07 20:54:19 +05:30
Sidharth Vinod
bb2002fce2
chore: Run postbuild with prepare 
As postbuild was not running with prepare, PR that updated `documentation` package was green,  although it should've failed.
 2022-09-07 20:51:46 +05:30
Sidharth Vinod
24bd55c360
Merge pull request #3419 from weedySeaDragon/docs/bug-3417-change_src_docs_only 
Docs/bug 3417
 2022-09-07 20:41:57 +05:30
Ashley Engelund (weedySeaDragon @ github)
b534a5c2ff Merge remote-tracking branch 'MERMAID/develop' into docs/3418_auto_generated_comment_html_files 2022-09-07 06:52:02 -07:00
Ashley Engelund (weedySeaDragon @ github)
04a25092f4 (formatting) prettier fix 2022-09-07 06:40:26 -07:00
Ashley Engelund (weedySeaDragon @ github)
b7cf7beb22 Merge remote-tracking branch 'MERMAID/develop' into docs/bug-3417-change_src_docs_only 2022-09-07 06:36:13 -07:00
Knut Sveidqvist
c50a7533f6 Removed warnings in the grammar oand some console logging 2022-09-07 12:38:26 +02:00