Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: mermaid-js/mermaid
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v9.1.7
Choose a base ref
...
head repository: mermaid-js/mermaid
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v9.2.0
Choose a head ref

Commits on Jul 21, 2022

  1. First take on grammar

    knsv committed Jul 21, 2022
    Copy the full SHA
    6029c53 View commit details

Commits on Jul 23, 2022

  1. Copy the full SHA
    7de68f0 View commit details

Commits on Jul 24, 2022

  1. Layout algorithm in place

    knsv committed Jul 24, 2022
    Copy the full SHA
    8e5e212 View commit details
  2. Draft of edge rendering

    knsv committed Jul 24, 2022
    Copy the full SHA
    15f1cdf View commit details

Commits on Jul 25, 2022

  1. Copy the full SHA
    f815bd0 View commit details
  2. Theme support for mindmaps

    knsv committed Jul 25, 2022
    Copy the full SHA
    0b2ca29 View commit details

Commits on Jul 27, 2022

  1. Adding default node form

    knsv committed Jul 27, 2022
    Copy the full SHA
    03d7182 View commit details
  2. Better padding handling in nodes

    knsv committed Jul 27, 2022
    Copy the full SHA
    2d36196 View commit details
  3. Copy the full SHA
    82a480d View commit details
  4. Adding icon support

    knsv committed Jul 27, 2022
    Copy the full SHA
    1a205ae View commit details
  5. Fix

    knsv committed Jul 27, 2022
    Copy the full SHA
    ca3f455 View commit details

Commits on Jul 28, 2022

  1. Copy the full SHA
    00fe5d4 View commit details

Commits on Jul 29, 2022

  1. Copy the full SHA
    e31acfb View commit details
  2. Curved edges

    knsv committed Jul 29, 2022
    Copy the full SHA
    ffe520d View commit details

Commits on Aug 1, 2022

  1. Copy the full SHA
    dfc2866 View commit details

Commits on Aug 6, 2022

  1. Changes after merge

    knsv committed Aug 6, 2022
    Copy the full SHA
    afe343e View commit details
  2. Copy the full SHA
    9b54fea View commit details

Commits on Aug 9, 2022

  1. Bugfix for empty blank lines

    knsv committed Aug 9, 2022
    Copy the full SHA
    d32c853 View commit details

Commits on Aug 20, 2022

  1. Typescript init

    sidharthv96 committed Aug 20, 2022
    Copy the full SHA
    88e17bf View commit details
  2. tsConversion: DetectType

    sidharthv96 committed Aug 20, 2022
    Copy the full SHA
    95dbbb3 View commit details
  3. Copy the full SHA
    c9cd569 View commit details
  4. tsConversion: logger

    sidharthv96 committed Aug 20, 2022
    Copy the full SHA
    896154d View commit details
  5. Copy the full SHA
    fab9688 View commit details

Commits on Aug 21, 2022

  1. Add trace logLevel

    sidharthv96 committed Aug 21, 2022
    Copy the full SHA
    d9bace0 View commit details
  2. tsConversion: styles

    sidharthv96 committed Aug 21, 2022
    Copy the full SHA
    238cbd1 View commit details
  3. Add trace logLevel

    sidharthv96 committed Aug 21, 2022
    Copy the full SHA
    6de66ea View commit details
  4. Copy the full SHA
    f14f0d9 View commit details
  5. fix: sanitization bug

    sidharthv96 committed Aug 21, 2022
    Copy the full SHA
    4710f67 View commit details
  6. fix: codeScanning vuln

    sidharthv96 committed Aug 21, 2022
    Copy the full SHA
    cd4b1ea View commit details
  7. Copy the full SHA
    c68ec54 View commit details
  8. Merge branch 'develop' into sidv/typescript

    * develop:
      Fix #3009 Update main
      #3243 Adding disabled testcase for diagram with leading \n
    sidharthv96 committed Aug 21, 2022
    Copy the full SHA
    a51d8e8 View commit details
  9. fix: startOnLoad

    sidharthv96 committed Aug 21, 2022
    Copy the full SHA
    d97b380 View commit details
  10. Copy the full SHA
    39aaf2f View commit details

Commits on Aug 22, 2022

  1. tsConversion: mermaidAPI

    sidharthv96 committed Aug 22, 2022
    Copy the full SHA
    d365dac View commit details
  2. Copy the full SHA
    c245a2d View commit details
  3. Copy the full SHA
    1549eb2 View commit details
  4. Merge branch 'develop' into sidv/typescript

    * develop:
      chore: update browsers list
    sidharthv96 committed Aug 22, 2022
    Copy the full SHA
    a2469b6 View commit details
  5. fix detectType

    sidharthv96 committed Aug 22, 2022
    Copy the full SHA
    4885e7b View commit details
  6. fix detectType

    sidharthv96 committed Aug 22, 2022
    Copy the full SHA
    9f49259 View commit details
  7. fix detectType

    sidharthv96 committed Aug 22, 2022
    Copy the full SHA
    6291e4d View commit details
  8. fix: review comments

    sidharthv96 committed Aug 22, 2022
    Copy the full SHA
    9a0d5e3 View commit details
  9. Update src/config.ts

    Agree!
    
    Co-authored-by: Sidharth Vinod <sidharthv96@gmail.com>
    knsv and sidharthv96 authored Aug 22, 2022
    Copy the full SHA
    0e0802a View commit details

Commits on Aug 23, 2022

  1. Remove console.logs

    sidharthv96 committed Aug 23, 2022
    Copy the full SHA
    32ba2d5 View commit details
  2. Merge branch 'sidv/typescript' of https://github.com/mermaid-js/mermaid

    … into sidv/typescript
    
    * 'sidv/typescript' of https://github.com/mermaid-js/mermaid:
      Update src/config.ts
    sidharthv96 committed Aug 23, 2022
    Copy the full SHA
    a8042f6 View commit details

Commits on Aug 24, 2022

  1. Cleanup

    sidharthv96 committed Aug 24, 2022
    Copy the full SHA
    1efd5c7 View commit details
  2. Merge branch 'develop' into sidv/typescript

    * develop: (22 commits)
      Fix for build by revering jsdoc
      Revert "chore(deps-dev): bump documentation from 13.2.0 to 14.0.0"
      Review comments.
      Add test for handling parameter names that are "default"
      Add test for handling parameter names that are keywords
      Add test for handling trailing whitespaces
      Add first C4 parser test
      chore(deps-dev): bump eslint-plugin-jest from 26.8.2 to 26.8.7
      chore(deps-dev): bump documentation from 13.2.0 to 14.0.0
      chore(deps-dev): bump terser-webpack-plugin from 5.3.4 to 5.3.5
      chore(deps-dev): bump prettier-plugin-jsdoc from 0.3.38 to 0.4.1
      test(e2e): add array and generic attributes erDiagram test
      test(common): add generic parser test
      test(parser): add tests for generics and arrays in erDiagram
      feat: add array and generic symbols for erDiagram
      Lint markdown
      Fix prettier formatting in vscode
      Prettier
      Fix `securityLevel` docs
      Update README.md
      ...
    sidharthv96 committed Aug 24, 2022
    Copy the full SHA
    60651fd View commit details
  3. Remove failing test

    sidharthv96 committed Aug 24, 2022
    Copy the full SHA
    84148d4 View commit details
  4. Add nested test

    sidharthv96 committed Aug 24, 2022
    Copy the full SHA
    c37ff47 View commit details

Commits on Aug 25, 2022

  1. Fix nested types

    Co-authored-by: FlorianWoelki <FlorianWoelki@gmx.de>
    sidharthv96 and FlorianWoelki committed Aug 25, 2022
    Copy the full SHA
    5996e1e View commit details
  2. Fix nested types

    Co-authored-by: FlorianWoelki <FlorianWoelki@gmx.de>
    sidharthv96 and FlorianWoelki committed Aug 25, 2022
    Copy the full SHA
    2f7930e View commit details
Showing 559 changed files with 61,036 additions and 21,912 deletions.
6 changes: 2 additions & 4 deletions .commitlintrc.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
{
"extends": [
"@commitlint/config-conventional"
]
}
"extends": ["@commitlint/config-conventional"]
}
3 changes: 3 additions & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
dist/**
.github/**
docs/Setup.md
cypress.config.js
cypress/plugins/index.js
coverage
40 changes: 32 additions & 8 deletions .eslintrc.json
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@
"jest/globals": true,
"node": true
},
"parser": "@babel/eslint-parser",
"parser": "@typescript-eslint/parser",
"parserOptions": {
"ecmaFeatures": {
"experimentalObjectRestSpread": true,
@@ -15,13 +15,15 @@
},
"extends": [
"eslint:recommended",
"plugin:@typescript-eslint/recommended",
"plugin:jsdoc/recommended",
"plugin:json/recommended",
"plugin:markdown/recommended",
"plugin:prettier/recommended"
"prettier"
],
"plugins": ["html", "jest", "jsdoc", "json", "prettier"],
"plugins": ["@typescript-eslint", "html", "jest", "jsdoc", "json"],
"rules": {
"no-console": "error",
"no-prototype-builtins": "off",
"no-unused-vars": "off",
"jsdoc/check-indentation": "off",
@@ -30,22 +32,44 @@
"jsdoc/multiline-blocks": "off",
"jsdoc/newline-after-description": "off",
"jsdoc/tag-lines": "off",
"jsdoc/require-param-description": "off",
"jsdoc/require-param-type": "off",
"jsdoc/require-returns": "off",
"jsdoc/require-returns-description": "off",
"cypress/no-async-tests": "off",
"@typescript-eslint/ban-ts-comment": [
"error",
{
"ts-expect-error": "allow-with-description",
"ts-ignore": "allow-with-description",
"ts-nocheck": "allow-with-description",
"ts-check": "allow-with-description",
"minimumDescriptionLength": 10
}
],
"json/*": ["error", "allowComments"],
"no-empty": ["error", { "allowEmptyCatch": true }]
},
"overrides": [
{
"files": "./**/*.html",
"files": ["cypress/**", "demos/**"],
"rules": {
"no-undef": "off",
"jsdoc/require-jsdoc": "off"
"no-console": "off"
}
},
{
"files": "./**/*.md/*.html",
"files": ["*.spec.{ts,js}", "cypress/**", "demos/**", "**/docs/**"],
"rules": {
"prettier/prettier": "off"
"jsdoc/require-jsdoc": "off",
"@typescript-eslint/no-unused-vars": "off"
}
},
{
"files": ["*.html", "*.md", "**/*.md/*"],
"rules": {
"no-var": "error",
"no-undef": "off",
"@typescript-eslint/no-unused-vars": "off"
}
}
]
18 changes: 10 additions & 8 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
@@ -4,14 +4,14 @@ about: Create a report to help us improve
title: ''
labels: 'Status: Triage, Type: Bug / Error'
assignees: ''

---

**Describe the bug**
A clear and concise description of what the bug is.

**To Reproduce**
Steps to reproduce the behavior:

1. Go to '...'
2. Click on '....'
3. Scroll down to '....'
@@ -27,15 +27,17 @@ If applicable, add screenshots to help explain your problem.
If applicable, add the code sample or a link to the [live editor](https://mermaid.live).

**Desktop (please complete the following information):**
- OS: [e.g. iOS]
- Browser [e.g. chrome, safari]
- Version [e.g. 22]

- OS: [e.g. iOS]
- Browser [e.g. chrome, safari]
- Version [e.g. 22]

**Smartphone (please complete the following information):**
- Device: [e.g. iPhone6]
- OS: [e.g. iOS8.1]
- Browser [e.g. stock browser, safari]
- Version [e.g. 22]

- Device: [e.g. iPhone6]
- OS: [e.g. iOS8.1]
- Browser [e.g. stock browser, safari]
- Version [e.g. 22]

**Additional context**
Add any other context about the problem here.
1 change: 0 additions & 1 deletion .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
@@ -4,7 +4,6 @@ about: Suggest an idea for this project
title: ''
labels: 'Status: Triage, Type: Enhancement'
assignees: ''

---

**Is your feature request related to a problem? Please describe.**
11 changes: 6 additions & 5 deletions .github/ISSUE_TEMPLATE/question.md
Original file line number Diff line number Diff line change
@@ -4,12 +4,13 @@ about: Get some help from the community.
title: ''
labels: 'Help wanted!, Type: Other'
assignees: ''

---

## Help us help you!

You want an answer. Here are some ways to get it quicker:
* Use a clear and concise title.
* Try to pose a clear and concise question.
* Include as much, or as little, code as necessary.
* Don't be shy to give us some screenshots, if it helps!

- Use a clear and concise title.
- Try to pose a clear and concise question.
- Include as much, or as little, code as necessary.
- Don't be shy to give us some screenshots, if it helps!
2 changes: 1 addition & 1 deletion .github/codeql/codeql-config.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: "CodeQL config"
name: 'CodeQL config'
paths-ignore:
- dist
- cypress
32 changes: 16 additions & 16 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
version: 2
updates:
- package-ecosystem: npm
open-pull-requests-limit: 10
directory: /
target-branch: develop
versioning-strategy: increase
schedule:
interval: weekly
day: monday
time: "07:00"
- package-ecosystem: github-actions
directory: /
target-branch: develop
schedule:
interval: weekly
day: monday
time: "07:00"
- package-ecosystem: npm
open-pull-requests-limit: 10
directory: /
target-branch: develop
versioning-strategy: increase
schedule:
interval: weekly
day: monday
time: '07:00'
- package-ecosystem: github-actions
directory: /
target-branch: develop
schedule:
interval: weekly
day: monday
time: '07:00'
10 changes: 7 additions & 3 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -1,13 +1,17 @@
## :bookmark_tabs: Summary

Brief description about the content of your PR.

Resolves #<your issue id here>

## :straight_ruler: Design Decisions

Describe the way your implementation works or what design decisions you made if applicable.

### :clipboard: Tasks

Make sure you
- [ ] :book: have read the [contribution guidelines](https://github.com/mermaid-js/mermaid/blob/develop/CONTRIBUTING.md)
- [ ] :computer: have added unit/e2e tests (if appropriate)
- [ ] :bookmark: targeted `develop` branch

- [ ] :book: have read the [contribution guidelines](https://github.com/mermaid-js/mermaid/blob/develop/CONTRIBUTING.md)
- [ ] :computer: have added unit/e2e tests (if appropriate)
- [ ] :bookmark: targeted `develop` branch
2 changes: 1 addition & 1 deletion .github/stale.yml
Original file line number Diff line number Diff line change
@@ -16,4 +16,4 @@ markComment: >
# Comment to post when closing a stale issue. Set to `false` to disable
closeComment: >
This issue has been been automatically closed due to a lack of activity.
This is done to maintain a clean list of issues that the community is interested in developing.
This is done to maintain a clean list of issues that the community is interested in developing.
58 changes: 32 additions & 26 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -16,30 +16,36 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
node-version: [16.x]
node-version: [18.x]
steps:
- uses: actions/checkout@v3

- name: Setup Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v3
with:
cache: yarn
node-version: ${{ matrix.node-version }}

- name: Install Yarn
run: npm i yarn --global

- name: Install Packages
run: |
yarn install --frozen-lockfile
env:
CYPRESS_CACHE_FOLDER: .cache/Cypress

- name: Run Build
run: yarn build

- name: Upload Build as Artifact
uses: actions/upload-artifact@v3
with:
name: dist
path: dist
- uses: actions/checkout@v3

- uses: pnpm/action-setup@v2
# uses version from "packageManager" field in package.json

- name: Setup Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v3
with:
cache: pnpm
node-version: ${{ matrix.node-version }}

- name: Install Packages
run: |
pnpm install --frozen-lockfile
env:
CYPRESS_CACHE_FOLDER: .cache/Cypress

- name: Run Build
run: pnpm run build

- name: Upload Mermaid Build as Artifact
uses: actions/upload-artifact@v3
with:
name: mermaid-build
path: packages/mermaid/dist

- name: Upload Mermaid Mindmap Build as Artifact
uses: actions/upload-artifact@v3
with:
name: mermaid-mindmap-build
path: packages/mermaid-mindmap/dist
18 changes: 9 additions & 9 deletions .github/workflows/checks.yml
Original file line number Diff line number Diff line change
@@ -14,12 +14,12 @@ jobs:
name: check tests
if: github.repository_owner == 'mermaid-js'
steps:
- uses: actions/checkout@v2
with:
fetch-depth: 0
- uses: testomatio/check-tests@stable
with:
framework: cypress
tests: "./cypress/e2e/**/**.spec.js"
token: ${{ secrets.GITHUB_TOKEN }}
has-tests-label: true
- uses: actions/checkout@v3
with:
fetch-depth: 0
- uses: testomatio/check-tests@stable
with:
framework: cypress
tests: './cypress/e2e/**/**.spec.js'
token: ${{ secrets.GITHUB_TOKEN }}
has-tests-label: true
Loading