Commit Graph

5815 Commits

Author SHA1 Message Date
Knut Sveidqvist 802407c8ae Merge remote-tracking branch 'origin/develop' into lazy-load-import 2022-10-07 10:46:16 +02:00
Knut Sveidqvist 439274c5ae chore: Cleanup 2022-10-07 10:40:01 +02:00
Knut Sveidqvist 931120f73c
Merge pull request #3574 from mermaid-js/sidv/fixE2E
fix(tests): E2E
2022-10-07 10:25:55 +02:00
Sidharth Vinod 1fb671c561
Merge branch 'develop' into sidv/fixE2E
* develop:
  fix: pnpm not found
2022-10-07 15:06:12 +08:00
Sidharth Vinod 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
Sidharth Vinod 66bc844cc9
chore: cleanup 2022-10-07 14:53:16 +08:00
Sidharth Vinod 3e3de72093
fix: dynamic import 2022-10-07 14:51:37 +08:00
Knut Sveidqvist 883d0d5039
Merge pull request #3592 from mermaid-js/lazy-load-import
Lazy load import
2022-10-06 18:19:19 +02:00
Knut Sveidqvist e49825b7a3
Merge pull request #3589 from mermaid-js/sidv/fixLazyLoad
fix: Import diagram
2022-10-06 18:16:42 +02:00
Sidharth Vinod 9f286b46ff
fix: Filename in viewer.js 2022-10-06 23:39:30 +08:00
Sidharth Vinod 803ea863fd
fix: pnpm not found 2022-10-06 22:58:54 +08:00
Sidharth Vinod d59f878020
fix: use async in render-after-error 2022-10-06 17:49:10 +08:00
Sidharth Vinod 646a96e5f0
Merge branch 'develop' into sidv/fixE2E
* develop:
  chore: Format COC.
2022-10-06 17:44:54 +08:00
Sidharth Vinod 77a1aea7b9
chore: Format COC. 2022-10-06 17:44:35 +08:00
Sidharth Vinod f3f4672816
Merge branch 'develop' into sidv/fixE2E
* develop:
  Appended Contact Mail of Mermaid
  Added sttributes to CODE OF CONDUCT
  build(test): remove vitest from subpackages
  test: remove `import {it} from "vitest"`
  chore(docs): run `pnpm run docs:build`
  CODE_OF_CONDUCT Uploaded
2022-10-06 17:34:51 +08:00
Sidharth Vinod b68a38443c
Merge pull request #3587 from aloisklink/test/fix-unit-tests
Fix failing vitest unit tests
2022-10-06 17:33:57 +08:00
Sidharth Vinod c919bef70e
fix: Import diagram 2022-10-06 13:47:00 +08:00
Knut Sveidqvist b1540d1491
Merge pull request #3578 from swoyam2609/develop
CODE_OF_CONDUCT Uploaded
2022-10-06 07:18:10 +02:00
Swoyam Siddharth Nayak 8ff40c152b
Merge branch 'mermaid-js:develop' into develop 2022-10-06 10:37:22 +05:30
Swoyam Siddharth Nayak 51803f00fb
Appended Contact Mail of Mermaid 2022-10-06 10:37:12 +05:30
Sidharth Vinod fb4aefeae7
Merge pull request #3586 from aloisklink/chore/sync-docs
Sync `docs/` with `packages/mermaid/src/docs`
2022-10-06 12:58:14 +08:00
Sidharth Vinod 7d987e5877
Merge branch 'develop' into sidv/fixE2E
* develop:
  docs: Rebuild
2022-10-06 12:57:18 +08:00
Sidharth Vinod 816b6276a6
docs: Rebuild 2022-10-06 12:56:51 +08:00
Sidharth Vinod 836a026f63
Merge branch 'develop' into sidv/fixE2E
* develop:
  update demo diagrams to have lang, hr tags, src = mermaid.js where needed.
2022-10-06 12:41:58 +08:00
Swoyam Siddharth Nayak dc9ddc77ea
Merge branch 'mermaid-js:develop' into develop 2022-10-06 09:47:10 +05:30
Swoyam Siddharth Nayak fdbd38ed5f
Added sttributes to CODE OF CONDUCT 2022-10-06 09:46:57 +05:30
Alois Klink 1f39fde230 build(test): remove vitest from subpackages
Removes vitest from all subpackages so that vitest/`pnpm run test`
are only in the root mono-repo.

This is required, because otherwise the root vitest and the subpackage
vitest versions can otherwise be slightly different, which causes
issues when running unit tests:

```Snapshot cannot be used outside of test```

In the future, we may want to consider moving package specific
tests into `packages/*/test`, and instead running these tests
with `pnpm run --recursive`, so that tests are run in each package by
their own version of vitest. This is the way that most projects
do things (e.g. https://github.com/vitest-dev/vitest).
2022-10-06 00:56:54 +01:00
Alois Klink c420224080 test: remove `import {it} from "vitest"`
We're getting a lot of vitest errors that say:
```Error: No test suite found in file```

I think this is because vitest is somehow
importing a different version the it/test function than the globally
inserted functions.

Removing the imports fixes this.
2022-10-06 00:48:50 +01:00
Alois Klink b1f13cbb9a chore(docs): run `pnpm run docs:build`
It looks like the docs/ folder somehow got out of sync
with the packages/mermaid/src/docs folder.

Maybe it was due to a semantic merge conflict
(e.g. `git merge` didn't throw an error, but the merge was bad)
2022-10-06 00:08:00 +01:00
Knut Sveidqvist 0f2e0c2ab4 Updated logic for diagram loading 2022-10-05 22:03:05 +02:00
Alois Klink d8af97c152
Merge pull request #3545 from weedySeaDragon/chore/update-demo-files-packages
chore: Update demo diagrams for monorepo
2022-10-05 21:03:03 +01:00
Swoyam Siddharth Nayak 528ebd8f12
CODE_OF_CONDUCT Uploaded 2022-10-05 16:47:35 +05:30
Knut Sveidqvist c05c98c082 WIP 2022-10-05 13:14:05 +02:00
Sidharth Vinod d8c7557ae5
fix: Docs 2022-10-05 16:05:27 +08:00
Sidharth Vinod f9753fc621
chore: Update test URL 2022-10-05 16:04:26 +08:00
Sidharth Vinod 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
Sidharth Vinod 74bd576ebc
fix(mermaid): Add await to render in init. 2022-10-05 14:52:04 +08:00
Sidharth Vinod a017ffc3c9
fix(test): Rerender 2022-10-05 14:08:53 +08:00
Sidharth Vinod d3a81f025a
chore(tests): Interaction - cleanup 2022-10-04 16:59:05 +08:00
Sidharth Vinod 750f647b0d
fix(tests): Interaction - Security strict, other 2022-10-04 16:55:46 +08:00
Sidharth Vinod 2a9e56439e
fix(tests): Interaction test - Security loose. 2022-10-04 16:37:37 +08:00
Ashish Jain e4bca33d00
Merge pull request #3562 from mermaid-js/3561_theme_color_scales
3561 theme color scales
2022-10-04 09:48:20 +02:00
Knut Sveidqvist 1528c03f85 Updated lockfile 2022-10-04 08:51:12 +02:00
Knut Sveidqvist c73c68532a
Merge pull request #3572 from mermaid-js/dependabot/npm_and_yarn/develop/commitlint/config-conventional-tw-17.1.0
chore(deps-dev): update @commitlint/config-conventional requirement from ^17.0.0 to ^17.1.0
2022-10-04 08:47:26 +02:00
Knut Sveidqvist 989c8969cb
Merge pull request #3571 from mermaid-js/dependabot/npm_and_yarn/develop/eslint-plugin-jest-tw-27.1.0
chore(deps-dev): update eslint-plugin-jest requirement from ^27.0.4 to ^27.1.0
2022-10-04 08:47:12 +02:00
Knut Sveidqvist ff2ff22d27
Merge pull request #3570 from mermaid-js/dependabot/npm_and_yarn/develop/vite-tw-3.1.4
chore(deps-dev): update vite requirement from ^3.0.9 to ^3.1.4
2022-10-04 08:46:58 +02:00
Knut Sveidqvist 5ef7bad1ce
Merge pull request #3568 from mermaid-js/dependabot/npm_and_yarn/develop/applitools/eyes-cypress-tw-3.27.1
chore(deps-dev): update @applitools/eyes-cypress requirement from ^3.25.7 to ^3.27.1
2022-10-04 08:46:47 +02:00
dependabot[bot] 5e0c321510
chore(deps-dev): update vite requirement from ^3.0.9 to ^3.1.4
Updates the requirements on [vite](https://github.com/vitejs/vite/tree/HEAD/packages/vite) to permit the latest version.
- [Release notes](https://github.com/vitejs/vite/releases)
- [Changelog](https://github.com/vitejs/vite/blob/v3.1.4/packages/vite/CHANGELOG.md)
- [Commits](https://github.com/vitejs/vite/commits/v3.1.4/packages/vite)

---
updated-dependencies:
- dependency-name: vite
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-10-04 06:44:04 +00:00
Knut Sveidqvist f19fac97d1
Merge pull request #3573 from mermaid-js/dependabot/npm_and_yarn/develop/typescript-tw-4.8.4
chore(deps-dev): update typescript requirement from ^4.8.3 to ^4.8.4
2022-10-04 08:42:59 +02:00
Knut Sveidqvist d04f73af7e
Merge pull request #3569 from mermaid-js/dependabot/npm_and_yarn/develop/esbuild-tw-0.15.10
chore(deps-dev): update esbuild requirement from ^0.15.8 to ^0.15.10
2022-10-04 08:42:37 +02:00