mirrors
/
mermaid
mirror of https://github.com/mermaid-js/mermaid.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity
5,738 Commits 158 Branches 138 Tags 346 MiB
Commit Graph

641 Commits

Author SHA1 Message Date
dependabot[bot] f965f5643a
chore(deps-dev): update lint-staged requirement from ^13.0.0 to ^13.0.3 
Updates the requirements on [lint-staged](https://github.com/okonet/lint-staged) to permit the latest version.
- [Release notes](https://github.com/okonet/lint-staged/releases)
- [Commits](https://github.com/okonet/lint-staged/compare/v13.0.0...v13.0.3)

---
updated-dependencies:
- dependency-name: lint-staged
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-10-04 06:25:29 +00:00
Knut Sveidqvist 9468bffcbb Merge branch 'develop' of github.com:emersonbottero/mermaid into emersonbottero-develop 2022-10-04 08:23:36 +02:00
Emerson Bottero 9901a73a2a Merge branch 'develop' of https://github.com/emersonbottero/mermaid into develop 2022-10-03 14:01:05 -03:00
Emerson Bottero 40a319fc5b Fix postbuild script 2022-10-03 12:11:00 -03:00
dependabot[bot] 6f27c36186
chore(deps-dev): update @vitest/ui requirement from ^0.23.2 to ^0.23.4 
Updates the requirements on [@vitest/ui](https://github.com/vitest-dev/vitest/tree/HEAD/packages/ui) to permit the latest version.
- [Release notes](https://github.com/vitest-dev/vitest/releases)
- [Commits](https://github.com/vitest-dev/vitest/commits/v0.23.4/packages/ui)

---
updated-dependencies:
- dependency-name: "@vitest/ui"
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-10-03 07:00:41 +00:00
Alois Klink 1cdb0ff72c build: re-enable `prepare` script for husky setup 
Re-enables the `pnpm run prepare` script.

The prepare script is automatically run when running
`pnpm install` locally.

It both:
  - Sets up husky/git pre-commit scripts
  - Builds the `packages/mermaid/dist` folder.
 2022-09-29 19:48:54 +01:00
Knut Sveidqvist 972d025578 Merge branch 'develop' into 3061_making_a_monorepo 2022-09-29 16:28:57 +02:00
Knut Sveidqvist 09bc7e0acd Merge remote-tracking branch 'origin/develop' into develop 2022-09-29 16:25:09 +02:00
Emerson Bottero 6191bb5f1b
Merge branch 'develop' into develop 2022-09-28 22:47:48 -03:00
Emerson Bottero 2376d38e0e docs: improved search 2022-09-28 21:46:07 -03: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 6292bebcd3 Updated version 2022-09-28 14:15:17 +02:00
Knut Sveidqvist ef527cb0fa
Merge branch 'develop' into feature/3171--erDiagram-allow-chars-in-entity-name 2022-09-28 13:24:54 +02:00
dependabot[bot] 503cbedc96
chore(deps-dev): bump @types/prettier from 2.7.0 to 2.7.1 (#3520) 
Bumps [@types/prettier](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/prettier) from 2.7.0 to 2.7.1.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/prettier)

---
updated-dependencies:
- dependency-name: "@types/prettier"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2022-09-26 13:28:16 +02:00
dependabot[bot] a448409750
chore(deps-dev): bump eslint from 8.23.1 to 8.24.0 (#3521) 
Bumps [eslint](https://github.com/eslint/eslint) from 8.23.1 to 8.24.0.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md)
- [Commits](https://github.com/eslint/eslint/compare/v8.23.1...v8.24.0)

---
updated-dependencies:
- dependency-name: eslint
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2022-09-26 13:27:42 +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
Alois Klink 77831c424c ci(lint): fix lint tests CI to use pnpm 2022-09-25 20:02:23 +01:00
Alois Klink 69c13a6ecf build(docs): fix docs:build command for mono-repo 2022-09-25 20:02:23 +01:00
Alois Klink 97637da9e0 build: set "packageManager" to `pnpm@7.12.2` 
The ["packageManager"][1] field list the package manager that
is expected to be used.

This is required by the `pnpm/action-setup` GitHub Action.

[1]: https://nodejs.org/api/packages.html#packagemanager
 2022-09-25 19:22:48 +01:00
Emerson Bottero eeafa8f5aa docs: added the fixed search again 2022-09-24 23:24:48 -03:00
Ashley Engelund (weedySeaDragon @ github) ed0f22b037 Merge remote-tracking branch 'MERMAID/develop' into bug/er/allow-chars-in-entity-name 
# Conflicts:
#	vite.config.cts
#	yarn.lock
 2022-09-24 16:06:54 -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
Emerson Bottero 87911f4a56 docs: build working 2022-09-23 23:33:24 -03: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 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 eaa1602b1a
fix: json import, js-base64 
Co-authored-by: Alois Klink <alois@aloisklink.com>
 2022-09-23 15:42:41 +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 f40f2a0b44
cleanup 2022-09-23 10:53:37 +05:30
Sidharth Vinod d9406585c8
remove esbuild 2022-09-23 10:50:58 +05:30
Sidharth Vinod d6245fdbda
Merge branch 'develop' into sidv/viteVitest 
* develop: (30 commits)
  Fix docs
  Auto stash before merge of "develop" and "origin/develop"
  vite -> cts
  add lcov
  chore(deps-dev): bump esbuild from 0.15.6 to 0.15.8
  fix(docs): update link
  CI Concurrency 4
  Remove build
  Parallel e2e
  Revert "unify Jison tranformers"
  Update yarn.lock
  fix(docs): `mmd` detection
  Hope this fails
  Remove `docs:build` from postbuild.
  Add verification log
  This should fail CI
  chore(deps-dev): bump @types/lodash from 4.14.184 to 4.14.185
  Update integrations.md
  Add vitepress pluin
  Fix lint
  ...
 2022-09-22 15:39:26 +05:30
Sidharth Vinod aeb31fe1ae
Use vite for build 2022-09-22 15:35:22 +05:30
Knut Sveidqvist db31f61368 Use of pnpm for the monorepo 2022-09-22 11:12:57 +02:00
Emerson Bottero a96c5ed83a docs: migrating to vitepress 2022-09-21 19:40:49 -03:00
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
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 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
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
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 d7093c4891
Merge branch 'sidv/vitestEsbuildOnly' into sidv/viteVitest 
* sidv/vitestEsbuildOnly:
  Merge vitest & esbuild
  Merge vitest
  Revert "fix(test): No esm exports"
  fix(test): No esm exports
  unify Jison tranformers
  Fix jest
  fix: imports in HTML
  Revert "Add diagramAPI to outfile"
  Add `type: module` to package.json
  Update mermaid version
  Fix ports
  Fix mjs resolution
  Fix import errors
  fix: conflict
  ESM test
  Add local jison linting
  chore: cleanup
  chore: Remove webpack & babel dependencies
  feat: Remove webpack
 2022-09-21 00:15:11 +05:30
Sidharth Vinod 59f8f5f65e
Merge vitest & esbuild 2022-09-21 00:01:48 +05:30
Sidharth Vinod 3b30232e88
Merge vitest 2022-09-20 23:51:21 +05:30
Sidharth Vinod d5fc319d4e
Remove `docs:build` from postbuild. 2022-09-20 22:42:05 +05:30
Sidharth Vinod bb824f1147
Merge branch 'sidv/esbuildFail' into sidv/webpackBabelRemoval 
* sidv/esbuildFail:
  Update mermaid version
  Fix ports
  Fix mjs resolution
  Fix import errors
  fix: conflict
 2022-09-20 21:31:42 +05:30