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

5764 Commits

Author SHA1 Message Date
Sidharth Vinod 696164c9a6
Merge pull request #3519 from aloisklink/ci/fix-e2e-when-running-from-fork 
ci(e2e): fix e2e action when running from fork
 2022-09-26 07:57:11 +05:30
Alois Klink 493aac6885 Merge branch 'aloisklink/3061_monorepo-e2e-tests' into 3061_making_a_monorepo 
Fixes most CI actions to support pnpm and the mono-repo.

It looks like there are some errors related to `mermaid-mindmap`
not being able to find `mermaid` or `mermaid/diagramAPI`
 2022-09-25 20:36:52 +01:00
Alois Klink 56e1411d37 ci(e2e): fix e2e action when running from fork 
PRs from forks don't have acess to the secrets.CYPRESS_RECORD_KEY.
Because of this, we need to disable `recording`.
 2022-09-25 20:11:42 +01:00
Alois Klink e0805b8272 ci(build): fix build CI to use pnpm 
The packages/mermaid/dist build is now uploaded seperately from
the packages/mermaid-mindmap/dist build.
 2022-09-25 20:02:23 +01:00
Alois Klink e72059ba87 ci(e2e-applitools): fix applitools CI to use pnpm 2022-09-25 20:02:23 +01:00
Alois Klink 24d46fb936 ci(e2e): fix e2e tests CI to use pnpm 
We need to upgrade cypress-io/github-action to v4.2.0
as that's the first version that supported pnpm.

See https://github.com/cypress-io/github-action/releases/tag/v4.2.0
 2022-09-25 20:02:23 +01:00
Alois Klink 29c52ec4d4 chore: update pnpm-lock.yaml lockfile 2022-09-25 20:02:23 +01:00
Alois Klink 77831c424c ci(lint): fix lint tests CI to use pnpm 2022-09-25 20:02:23 +01:00
Alois Klink d633ec62df ci(unit): fix unit 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 69d05c454d style: ignore pnpm-lock.yaml from prettier 
The `pnpm-lock.yaml` file is auto-generated by PNPM.
 2022-09-25 19:52:27 +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
Alois Klink 535f555b13 test: fix unit tests in new mono-repo 2022-09-25 19:18:16 +01:00
Emerson Bottero d8ee2bb850 docs: no footer 2022-09-25 11:53:08 -03:00
Emerson Bottero 609d28c6ee docs: added edit and team page 2022-09-25 11:22:34 -03:00
Emerson Bottero eeafa8f5aa docs: added the fixed search again 2022-09-24 23:24:48 -03:00
Ashley Engelund (weedySeaDragon @ github) ddc35fa9ce a few more wee changes to the ER demo 2022-09-24 16:50:02 -07:00
Ashley Engelund (weedySeaDragon @ github) 908f5afe0f Merge remote-tracking branch 'MERMAID/develop' into develop 2022-09-24 16:16:29 -07:00
Ashley Engelund (weedySeaDragon @ github) 5daa130857 er demo: clarify comment about name 2022-09-24 16:11:07 -07:00
Ashley Engelund (weedySeaDragon @ github) c202b94a9a yarn install after merge with upstream/develop 2022-09-24 16:10:34 -07: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) 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
Emerson Bottero 5e4bcbdfa0 chore: fix Original Setup 2022-09-23 23:51:33 -03:00
Emerson Bottero 87911f4a56 docs: build working 2022-09-23 23:33:24 -03: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
Knut Sveidqvist af2b1945a3 Detector registering itself on load 2022-09-23 16:55:30 +02:00
Sidharth Vinod c32e76a870
Merge branch 'sidv/3061_monorepo' into 3061_making_a_monorepo 
* sidv/3061_monorepo:
  fix types for mermaid-mindmap
 2022-09-23 17:52:11 +05:30
Sidharth Vinod 8dcbe83b0b
fix types for mermaid-mindmap 2022-09-23 17:51:29 +05:30
Knut Sveidqvist 9fac7866f5
Merge pull request #3514 from mermaid-js/sidv/3061_monorepo 
[WIP] Monorepo build
 2022-09-23 14:14:07 +02:00
Sidharth Vinod 53bbf444e5
fix build 2022-09-23 17:39:08 +05:30
Knut Sveidqvist 1a46582e1e
Merge pull request #3503 from mermaid-js/sidv/viteVitest 
Build mermaid using Vite
 2022-09-23 14:04:39 +02:00
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 1e71798467
fix: Core build 2022-09-23 17:20:40 +05:30
Sidharth Vinod 8c63d002e7
fix: js-base64 
Co-authored-by: Alois Klink <alois@aloisklink.com>
 2022-09-23 16:53:11 +05:30
Sidharth Vinod 67b1e8dbe9
fix OutputOptions type 2022-09-23 16:00:27 +05:30
Sidharth Vinod bc0be28f08
fix: js-base64 
Co-authored-by: Alois Klink <alois@aloisklink.com>
 2022-09-23 15:54:24 +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 2a86ced835
fix: json import 
Co-authored-by: Alois Klink <alois@aloisklink.com>
 2022-09-23 15:23:15 +05:30
Sidharth Vinod ad49564ab5
vite build 2022-09-23 12:31:24 +05:30
Ian Lee e8cef4aa81
Make corresponding change to docs/ 
Previously failed the linting CI job.
 2022-09-22 23:58:17 -07:00
Ian Lee 56954067ab
Mention obsidian has native support for mermaid 2022-09-22 23:31:30 -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 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 404b718677
Merge branch '3061_making_a_monorepo' into sidv/3061_monorepo 
* 3061_making_a_monorepo:
  Fixed paths for dev server
  Use of pnpm for the monorepo
  Use of pnpm for the monorepo
 2022-09-23 11:23:38 +05:30
Sidharth Vinod 8a489176c3
ts conversion 2022-09-23 10:56:39 +05:30