From 4c4427a4b9a0055a1fe26deabd85ac2b864f0bf2 Mon Sep 17 00:00:00 2001 From: Sidharth Vinod Date: Thu, 3 Jun 2021 02:03:43 +0530 Subject: [PATCH] Touchup --- .eslintrc.cjs | 9 +-------- .github/pull_request_template.md | 4 ++-- README.md | 22 ++++------------------ 3 files changed, 7 insertions(+), 28 deletions(-) diff --git a/.eslintrc.cjs b/.eslintrc.cjs index 06aeb7b4..5de3a147 100644 --- a/.eslintrc.cjs +++ b/.eslintrc.cjs @@ -8,14 +8,7 @@ module.exports = { 'prettier' ], plugins: ['svelte3', 'tailwindcss', '@typescript-eslint'], - ignorePatterns: [ - 'docs/*', - '*.cjs', - 'snapshots.js', - 'svelte.config.js', - 'package.json', - 'README.md' - ], + ignorePatterns: ['docs/*', '*.cjs', '*.md', 'snapshots.js', 'svelte.config.js', 'package.json'], overrides: [{ files: ['*.svelte'], processor: 'svelte3/svelte3' }], settings: { 'svelte3/typescript': () => require('typescript') diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index ba659117..4aa47fd7 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -12,6 +12,6 @@ Describe the way your implementation works or what design decisions you made if Make sure you -- [ ] :book: have read the [contribution guidelines](https://github.com/mermaid-js/mermaid/blob/develop/CONTRIBUTING.md) +- [ ] :book: have read the [contribution guidelines](https://github.com/mermaid-js/mermaid/blob/master/CONTRIBUTING.md) - [ ] :computer: have added unit/e2e tests (if appropriate) -- [ ] :bookmark: targeted `master` branch +- [ ] :bookmark: targeted `develop` branch diff --git a/README.md b/README.md index 47d6b1fb..a7cd5804 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -[![Join our Slack!](https://img.shields.io/static/v1?message=join%20chat&color=9cf&logo=slack&label=slack)](https://join.slack.com/t/mermaid-talk/shared_invite/enQtNzc4NDIyNzk4OTAyLWVhYjQxOTI2OTg4YmE1ZmJkY2Y4MTU3ODliYmIwOTY3NDJlYjA0YjIyZTdkMDMyZTUwOGI0NjEzYmEwODcwOTE) +[![Mermaid Live Editor](https://img.shields.io/endpoint?url=https://dashboard.cypress.io/badge/detailed/2ckppp/master&style=flat&logo=cypress)](https://dashboard.cypress.io/projects/2ckppp/runs) [![Join our Slack!](https://img.shields.io/static/v1?message=join%20chat&color=9cf&logo=slack&label=slack)](https://join.slack.com/t/mermaid-talk/shared_invite/enQtNzc4NDIyNzk4OTAyLWVhYjQxOTI2OTg4YmE1ZmJkY2Y4MTU3ODliYmIwOTY3NDJlYjA0YjIyZTdkMDMyZTUwOGI0NjEzYmEwODcwOTE) # Contributors are welcome! @@ -29,20 +29,6 @@ This project is set up using [Yarn](https://classic.yarnpkg.com/en/docs/getting- yarn install ``` -or in develop branch to use the beta version of mermaid use - -``` -yarn install --update-checksums -``` - -This together with a .npmrc file: - -``` -registry=https://registry.npmjs.com/ -@mermaid-js:registry=https://npm.pkg.github.com -//npm.pkg.github.com/:_authToken="XXXXXXXXX" -``` - ## Development ``` @@ -53,6 +39,6 @@ This app is created with Svelte Kit. ## Release -``` -yarn release -``` +When a PR is created targeting master, it will be built and deployed as a beta in http://mermaid-js.github.io/mermaid-live-editor/beta + +Once the PR is merged, it will automatically be released.