Commit Graph

217 Commits

Author SHA1 Message Date
Sidharth Vinod 065756a90d
Merge branch 'develop' into sidv/parallelE2E
* 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:06:18 +05:30
Sidharth Vinod 3982d19e57
Merge branch 'develop' into sidv/removeWebpackBabel
* develop:
  Revert #3475
  ci(e2e-applitols): add applitools CI action
2022-09-21 11:04:35 +05:30
Sidharth Vinod 55d706323d
CI Concurrency 4 2022-09-21 10:42:27 +05:30
Sidharth Vinod 51df0a68cc
Remove build 2022-09-21 10:41:47 +05:30
Sidharth Vinod ca053e0a11
Parallel e2e 2022-09-21 10:36:38 +05:30
Alois Klink 5c8fda3891 ci(e2e-applitols): add applitools CI action
Adds a [`workflow_dispatch`][1] GitHub Actions CI workflow
that performs an E2E Cypress rendering test with Applitools
integration.

If the APPLITOOLS_API_KEY secret is not set, this action fallsback to
just doing a normal E2E Cypress test without Applitools support.

[1]: https://docs.github.com/en/actions/managing-workflow-runs/manually-running-a-workflow
2022-09-17 22:34:29 +01:00
Sidharth Vinod 25ed9063f2
Merge branch 'develop' into sidv/removeWebpackBabel
* develop: (77 commits)
  cleanup
  Fix docs
  Fix coverage
  Fix for issues in errorhandling and class diagrams after refactoring
  Replace GoogleAnalytics with Plausible
  chore(deps): bump dompurify from 2.3.10 to 2.4.0 (#3444)
  chore(deps): bump stylis from 4.1.1 to 4.1.2 (#3439)
  chore(deps-dev): bump webpack-dev-server from 4.10.1 to 4.11.0 (#3450)
  fix(git): support single character branch names
  Cleanup unused variables and some commented out code
  Cleanup fixing som lingering issues
  Remove extension
  Apply suggestions from code review
  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-16 23:24:17 +05:30
Alois Klink 20d22a6468 ci(e2e): re-enable e2e tests
I've removed the coverage upload bit, since although the
[@cypress/code-coverage][1] plugin is pretty easy to setup,
it requires babel, which we're about to remove and replace
with ESBuild.
2022-09-14 04:15:52 +01:00
Alois Klink c5033b92b4 style: fix .github/workflow/e2e styling
Uses prettier to fix e2e style issues.
2022-09-14 04:15:52 +01:00
Sidharth Vinod e7ac2368c3
Add local jison linting 2022-09-13 12:46:14 +05:30
dependabot[bot] 07638f5505
chore(deps): bump actions/checkout from 2 to 3 (#3449)
Bumps [actions/checkout](https://github.com/actions/checkout) from 2 to 3.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/v2...v3)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-major
...

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-12 19:27:45 +02:00
Knut Sveidqvist 73620ebee9
Merge pull request #3431 from aloisklink/other/re-enable-coverage
Re-enable coverage upload to coveralls
2022-09-12 19:04:54 +02:00
Alois Klink 5d72585705
ci: re-enable coveralls coverage upload
Reverts commits:
  - Disabling coveralls temporarilly
    aedf066337
  - Tmo disabling of coveralls
    a6b4cb24b8

I'm not 100% sure whether the `parallel` option is needed,
but I've left it disabled for now, since it'd would mean that we need
to merge both the `test.yml` and the `e2e.yml` file together.
2022-09-08 04:03:57 +01:00
Alois Klink 6e81ee9d97
Merge branch 'develop' into other/3339_forbid-console-in-src-code
Fixes merge conflict in:
  - .eslintrc.json due to 6167eda6b6
  - lint.yml due to 5674f8e675
2022-09-07 21:00:42 +01:00
Alois Klink 22d20cc76e ci: lint .jison files for any console.log()
Converts the *.jison files into .js, then lints them using just
the `no-console` rule.

To keep things simple, I've just made this run only on CI.

If we want to do more complex linting on `*.jison` files, it might
be worth making an `eslint-plugin-jison`, so that we can directly
parse jison in ESLint.
2022-09-06 04:29:09 +01:00
Sidharth Vinod 5674f8e675
Prettier Pass 2022-09-03 13:41:25 +05:30
Sidharth Vinod 13e7da10ca
Add doc verification to CI 2022-09-03 10:53:41 +05:30
Sidharth Vinod e7b199adaf
Update dependabot.yml 2022-08-31 11:48:23 +05:30
Sidharth Vinod 5b15865d30
fix #3184: Inject xlink in mermaidAPI. (#3185)
* fix #3184: Inject xlink in mermaidAPI.

* fix static analysis
2022-07-03 10:37:27 +02:00
Sidharth Vinod 4b78a2106d
Update links to `mermaid.live` (#3163)
* chore: update browsers list

* Re enable markdown & jsdoc linting.

* Update links to `mermaid.live`

Co-authored-by: sidharthv96 <sidharthv96@users.noreply.github.com>
2022-06-24 07:41:22 +02:00
Sidharth Vinod 8251bf204d
Run testomatio only for PRs within org. (#3165) 2022-06-23 08:19:52 +02:00
dependabot[bot] ff93945aaf
chore(deps): bump actions/dependency-review-action from 1 to 2 (#3161)
Bumps [actions/dependency-review-action](https://github.com/actions/dependency-review-action) from 1 to 2.
- [Release notes](https://github.com/actions/dependency-review-action/releases)
- [Commits](https://github.com/actions/dependency-review-action/compare/v1...v2)

---
updated-dependencies:
- dependency-name: actions/dependency-review-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-06-20 09:40:38 +02:00
Sidharth Vinod 4c671af723
fix testomatio 2022-06-20 11:03:42 +05:30
Yash-Singh1 b7b02fcc2c chore: rm cypress ex. and prevent dup ci 2022-05-10 17:29:50 -07:00
Yash-Singh1 9365138206 chore: split ci into seperate workflows 2022-05-10 17:26:17 -07:00
Naveen a62d53e9a7
chore: Enable codeql action (#2982) 2022-04-28 18:53:44 -07:00
Naveen f3f06aaefb
chore(deps): Included dependency review (#2984)
> Dependency Review GitHub Action in your repository to enforce dependency reviews on your pull requests.
> The action scans for vulnerable versions of dependencies introduced by package version changes in pull requests,
> and warns you about the associated security vulnerabilities.
> This gives you better visibility of what's changing in a pull request,
> and helps prevent vulnerabilities being added to your repository.

https://docs.github.com/en/code-security/supply-chain-security/understanding-your-software-supply-chain/about-dependency-review#dependency-review-enforcement
2022-04-28 16:13:43 -07:00
ashishj 386f3c7ce9 Merge branch 'develop' into feature/hideUnusedParticipants_1210 2022-04-28 17:38:48 +02:00
naveen 449ba284ce chore: Set permissions for GitHub actions
Restrict the GitHub token permissions only to the required ones; this way, even if the attackers will succeed in compromising your workflow, they won’t be able to do much.

- Included permissions for the action. https://github.com/ossf/scorecard/blob/main/docs/checks.md#token-permissions

https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#permissions

https://docs.github.com/en/actions/using-jobs/assigning-permissions-to-jobs

[Keeping your GitHub Actions and workflows secure Part 1: Preventing pwn requests](https://securitylab.github.com/research/github-actions-preventing-pwn-requests/)

Signed-off-by: naveen <172697+naveensrinivasan@users.noreply.github.com>
2022-04-25 23:38:27 +00:00
Yash-Singh1 4c93870580 feat: add hideUnusedParticipants and some cleanup 2022-04-14 19:19:18 -07:00
dependabot[bot] 6aa3e38edb
chore(deps): bump actions/upload-artifact from 2 to 3 (#2927)
Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 2 to 3.
- [Release notes](https://github.com/actions/upload-artifact/releases)
- [Commits](https://github.com/actions/upload-artifact/compare/v2...v3)

---
updated-dependencies:
- dependency-name: actions/upload-artifact
  dependency-type: direct:production
  update-type: version-update:semver-major
...

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-04-11 09:55:28 +02:00
Knut Sveidqvist 1ad2fad542 Tmp disabling of the e2e in the build 2022-04-07 19:12:55 +02:00
Knut Sveidqvist ada3f8e5e6 Removing pery usiage from e2e tests 2022-04-07 18:41:28 +02:00
Knut Sveidqvist 9f7130a3e6 Merge branch 'develop' into 1252_gitgraph_reinvented 2022-03-17 18:03:40 +01:00
Knut Sveidqvist 423ebfd5d5
Merge pull request #2823 from mermaid-js/dependabot/github_actions/develop/EndBug/add-and-commit-9
chore(deps): bump EndBug/add-and-commit from 8.0.2 to 9
2022-03-17 17:58:15 +01:00
Knut Sveidqvist 1f3293bb43 Merge branch 'develop' of github.com:mermaid-js/mermaid into develop 2022-03-17 17:55:55 +01:00
Knut Sveidqvist 2a449ab773 chore: disablinc sync check as the readmes have different contexts 2022-03-17 17:55:50 +01:00
dependabot[bot] fe6a042060
chore(deps): bump EndBug/add-and-commit from 8.0.2 to 9
Bumps [EndBug/add-and-commit](https://github.com/EndBug/add-and-commit) from 8.0.2 to 9.
- [Release notes](https://github.com/EndBug/add-and-commit/releases)
- [Changelog](https://github.com/EndBug/add-and-commit/blob/main/CHANGELOG.md)
- [Commits](https://github.com/EndBug/add-and-commit/compare/v8.0.2...v9)

---
updated-dependencies:
- dependency-name: EndBug/add-and-commit
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-03-14 07:06:49 +00:00
dependabot[bot] 5f3bb4aeeb
chore(deps): bump actions/checkout from 2 to 3 (#2803)
Bumps [actions/checkout](https://github.com/actions/checkout) from 2 to 3.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/v2...v3)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-major
...

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-03-07 19:18:05 +01:00
dependabot[bot] fd1cd908fe
chore(deps): bump actions/setup-node from 2 to 3 (#2784)
Bumps [actions/setup-node](https://github.com/actions/setup-node) from 2 to 3.
- [Release notes](https://github.com/actions/setup-node/releases)
- [Commits](https://github.com/actions/setup-node/compare/v2...v3)

---
updated-dependencies:
- dependency-name: actions/setup-node
  dependency-type: direct:production
  update-type: version-update:semver-major
...

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-02-28 08:17:30 +01:00
Ashish Jain 14464f9fba merge develop to current branch 2022-02-24 19:24:42 +01:00
kuanyi-ng ad08016509 create check-readme-in-sync workflow 2022-02-20 00:08:10 +09:00
Ashish Jain 40f95a5dc1 chore: merge branch 'develop' into 1252_gitgraph_reinvented 2022-02-17 17:48:48 +01:00
dependabot[bot] 869bb0f37f
chore(deps): bump EndBug/add-and-commit from 8.0.1 to 8.0.2 (#2722)
Bumps [EndBug/add-and-commit](https://github.com/EndBug/add-and-commit) from 8.0.1 to 8.0.2.
- [Release notes](https://github.com/EndBug/add-and-commit/releases)
- [Changelog](https://github.com/EndBug/add-and-commit/blob/main/CHANGELOG.md)
- [Commits](https://github.com/EndBug/add-and-commit/compare/v8.0.1...v8.0.2)

---
updated-dependencies:
- dependency-name: EndBug/add-and-commit
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-02-14 08:23:18 +01:00
Ashish Jain bb2dd2f5f3 getting there 2022-02-10 20:32:21 +01:00
dependabot[bot] 556f37284c
Bump EndBug/add-and-commit from 7 to 8.0.1 (#2665)
Bumps [EndBug/add-and-commit](https://github.com/EndBug/add-and-commit) from 7 to 8.0.1.
- [Release notes](https://github.com/EndBug/add-and-commit/releases)
- [Changelog](https://github.com/EndBug/add-and-commit/blob/main/CHANGELOG.md)
- [Commits](https://github.com/EndBug/add-and-commit/compare/v7...v8.0.1)

---
updated-dependencies:
- dependency-name: EndBug/add-and-commit
  dependency-type: direct:production
  update-type: version-update:semver-major
...

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-01-24 08:22:24 +01:00
Matthieu MOREL c2c753ce7d
Update update-browserlist.yml 2022-01-10 09:58:51 +01:00
Matthieu MOREL 1127ce7b50
Update update-browserlist.yml 2021-12-20 20:10:34 +01:00
Matthieu MOREL 53ea005ebc
create update-browserlist workflow (#2563) 2021-12-15 21:03:35 +01:00
Yash-Singh1 31c29b4c02 Merge branch 'develop' of github.com:mermaid-js/mermaid into prLabelerValidator 2021-11-25 14:31:32 -08:00