diff --git a/.eslintrc.json b/.eslintrc.json index 6c262516f..b223ac86c 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -4,7 +4,7 @@ "es6": true, "node": true }, - "parser": "babel-eslint", + "parser": "@babel/eslint-parser", "parserOptions": { "ecmaFeatures": { "experimentalObjectRestSpread": true, diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index 3ee68b30b..74e02e6cb 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -23,6 +23,9 @@ A clear and concise description of what you expected to happen. **Screenshots** If applicable, add screenshots to help explain your problem. +**Code Sample** +If applicable, add the code sample or a link to the [live editor](https://mermaid-js.github.io/mermaid-live-editor). + **Desktop (please complete the following information):** - OS: [e.g. iOS] - Browser [e.g. chrome, safari] diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 000000000..c5b27177d --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,12 @@ +version: 2 +updates: +- package-ecosystem: npm + directory: / + target-branch: develop + schedule: + interval: weekly +- package-ecosystem: github-actions + directory: / + target-branch: develop + schedule: + interval: weekly diff --git a/.github/pr-labeler.yml b/.github/pr-labeler.yml index 077cc568b..5ed526bc5 100644 --- a/.github/pr-labeler.yml +++ b/.github/pr-labeler.yml @@ -1,3 +1,4 @@ 'Type: Bug / Error': 'bug/*' 'Type: Enhancement': 'feature/*' 'Type: Other': 'other/*' +'Type: Dependabot': 'dependabot/*' diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index cbcac4b24..a530e188c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -7,27 +7,21 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - node-version: [10.x, 12.x] + node-version: [16.x] steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v2 - name: Setup Node.js ${{ matrix.node-version }} - uses: actions/setup-node@v1 + uses: actions/setup-node@v2 with: + cache: yarn node-version: ${{ matrix.node-version }} - name: Install Yarn run: npm i yarn --global - - name: Cache Node Modules - uses: actions/cache@v1 - with: - path: .cache - key: ${{ runner.OS }}-build-${{ hashFiles('**/yarn.lock') }} - - name: Install Packages run: | - yarn config set cache-folder $GITHUB_WORKSPACE/.cache/yarn yarn install --frozen-lockfile env: CYPRESS_CACHE_FOLDER: .cache/Cypress @@ -36,7 +30,7 @@ jobs: run: yarn build - name: Upload Build as Artifact - uses: actions/upload-artifact@v1 + uses: actions/upload-artifact@v2 with: name: dist path: dist @@ -61,4 +55,4 @@ jobs: # uses: coverallsapp/github-action@master # with: # github-token: ${{ secrets.GITHUB_TOKEN }} - # parallel-finished: true \ No newline at end of file + # parallel-finished: true diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index 53285bc28..0a01f3039 100644 --- a/.github/workflows/e2e.yml +++ b/.github/workflows/e2e.yml @@ -7,27 +7,21 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - node-version: [12.x] + node-version: [16.x] steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v2.3.4 - name: Setup Node.js ${{ matrix.node-version }} - uses: actions/setup-node@v1 + uses: actions/setup-node@v2 with: + cache: yarn node-version: ${{ matrix.node-version }} - name: Install Yarn run: npm i yarn --global - - name: Cache Node Modules - uses: actions/cache@v1 - with: - path: .cache - key: ${{ runner.OS }}-build-${{ hashFiles('**/yarn.lock') }} - - name: Install Packages run: | - yarn config set cache-folder $GITHUB_WORKSPACE/.cache/yarn yarn install --frozen-lockfile env: CYPRESS_CACHE_FOLDER: .cache/Cypress @@ -55,4 +49,4 @@ jobs: # uses: coverallsapp/github-action@master # with: # github-token: ${{ secrets.GITHUB_TOKEN }} - # parallel-finished: true \ No newline at end of file + # parallel-finished: true diff --git a/.github/workflows/issue-triage.yml b/.github/workflows/issue-triage.yml index 53d5f6b87..b6b424f3e 100644 --- a/.github/workflows/issue-triage.yml +++ b/.github/workflows/issue-triage.yml @@ -8,7 +8,7 @@ jobs: triage: runs-on: ubuntu-latest steps: - - uses: andymckay/labeler@1.0 + - uses: andymckay/labeler@1.0.3 with: repo-token: "${{ secrets.GITHUB_TOKEN }}" labels: "Status: Triage" diff --git a/.github/workflows/lock-closed-issue.yml b/.github/workflows/lock-closed-issue.yml index ae74c03ef..11c3f35dd 100644 --- a/.github/workflows/lock-closed-issue.yml +++ b/.github/workflows/lock-closed-issue.yml @@ -8,6 +8,6 @@ jobs: triage: runs-on: ubuntu-latest steps: - - uses: Dunning-Kruger/lock-issues@v1 + - uses: Dunning-Kruger/lock-issues@v1.1 with: repo-token: "${{ secrets.GITHUB_TOKEN }}" diff --git a/.github/workflows/release-draft.yml b/.github/workflows/release-draft.yml index 68be3a1e5..a37b7bcf2 100644 --- a/.github/workflows/release-draft.yml +++ b/.github/workflows/release-draft.yml @@ -10,6 +10,6 @@ jobs: runs-on: ubuntu-latest steps: - name: Draft Release - uses: toolmantim/release-drafter@v5.2.0 + uses: toolmantim/release-drafter@v5 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/release-preview-publish.yml b/.github/workflows/release-preview-publish.yml index e7d5b994c..8136ff8bd 100644 --- a/.github/workflows/release-preview-publish.yml +++ b/.github/workflows/release-preview-publish.yml @@ -9,11 +9,11 @@ jobs: publish: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v2 - name: Setup Node.js - uses: actions/setup-node@v1 + uses: actions/setup-node@v2 with: - node-version: 10.x + node-version: 16.x - name: Install Yarn run: npm i yarn --global @@ -25,7 +25,7 @@ jobs: - name: Publish run: | - PREVIEW_VERSION=$(git rev-list --count --first-parent HEAD) + PREVIEW_VERSION=8 VERSION=$(echo ${{github.ref}} | tail -c +20)-preview.$PREVIEW_VERSION echo $VERSION npm version --no-git-tag-version --allow-same-version $VERSION diff --git a/.github/workflows/release-publish.yml b/.github/workflows/release-publish.yml index 254a38654..62382a882 100644 --- a/.github/workflows/release-publish.yml +++ b/.github/workflows/release-publish.yml @@ -8,13 +8,13 @@ jobs: publish: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v2.3.4 - uses: fregante/setup-git-user@v1 - name: Setup Node.js - uses: actions/setup-node@v1 + uses: actions/setup-node@v2 with: - node-version: 10.x + node-version: 16.x - name: Install Yarn run: npm i yarn --global diff --git a/.percy.old.yml b/.percy.old.yml new file mode 100644 index 000000000..5499b41f2 --- /dev/null +++ b/.percy.old.yml @@ -0,0 +1,3 @@ +version: 1 +snapshot: + widths: [1280] \ No newline at end of file diff --git a/.percy.yml b/.percy.yml index 5499b41f2..f56df3d5e 100644 --- a/.percy.yml +++ b/.percy.yml @@ -1,3 +1,6 @@ -version: 1 +version: 2 snapshot: - widths: [1280] \ No newline at end of file + widths: + - 1280 +discovery: + disable-cache: true diff --git a/.prettierrc b/.prettierrc index 5ac85e271..e9eb8060d 100644 --- a/.prettierrc +++ b/.prettierrc @@ -1,4 +1,5 @@ { "printWidth": 100, - "singleQuote": true + "singleQuote": true, + "endOfLine": "auto" } diff --git a/README.md b/README.md index f990d91e1..5868e0bb3 100644 --- a/README.md +++ b/README.md @@ -1,16 +1,12 @@ # mermaid [](https://travis-ci.org/mermaid-js/mermaid) [](https://www.npmjs.com/package/mermaid) [](https://coveralls.io/github/mermaid-js/mermaid?branch=master) [](https://join.slack.com/t/mermaid-talk/shared_invite/enQtNzc4NDIyNzk4OTAyLWVhYjQxOTI2OTg4YmE1ZmJkY2Y4MTU3ODliYmIwOTY3NDJlYjA0YjIyZTdkMDMyZTUwOGI0NjEzYmEwODcwOTE) [](https://percy.io/Mermaid/mermaid) -
-
-
-
-