From 9513e0e2d56786adced7465f6dc804c6f942c34f Mon Sep 17 00:00:00 2001 From: Alois Klink Date: Thu, 29 Sep 2022 19:48:02 +0100 Subject: [PATCH 1/3] build: update pre-commit rules to use `pnpm` Update husky and lint-staged to use pnpm instead of yarn. --- .husky/pre-commit | 2 +- .lintstagedrc.json | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.husky/pre-commit b/.husky/pre-commit index 025779ed2..a9e30b9be 100755 --- a/.husky/pre-commit +++ b/.husky/pre-commit @@ -1,4 +1,4 @@ #!/bin/sh . "$(dirname "$0")/_/husky.sh" -yarn pre-commit +pnpm run pre-commit diff --git a/.lintstagedrc.json b/.lintstagedrc.json index 1e7c61dd8..a6c963ff6 100644 --- a/.lintstagedrc.json +++ b/.lintstagedrc.json @@ -1,6 +1,6 @@ { - "src/docs/**": ["yarn docs:build --git"], - "src/docs.mts": ["yarn docs:build --git"], + "src/docs/**": ["pnpm run docs:build --git"], + "src/docs.mts": ["pnpm run docs:build --git"], "*.{ts,js,json,html,md,mts}": ["eslint --fix", "prettier --write"], - "*.jison": ["yarn lint:jison"] + "*.jison": ["pnpm run lint:jison"] } From 1cdb0ff72c5b9f2f1fabc6f0ef7f7b52efcb41d4 Mon Sep 17 00:00:00 2001 From: Alois Klink Date: Thu, 29 Sep 2022 19:48:54 +0100 Subject: [PATCH 2/3] build: re-enable `prepare` script for husky setup Re-enables the `pnpm run prepare` script. The prepare script is automatically run when running `pnpm install` locally. It both: - Sets up husky/git pre-commit scripts - Builds the `packages/mermaid/dist` folder. --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 003439bb4..e58109b32 100644 --- a/package.json +++ b/package.json @@ -46,7 +46,7 @@ "test": "pnpm lint && vitest run", "test:watch": "vitest --coverage --watch", "prepublishOnly": "pnpm build && pnpm test", - "todo-prepare": "concurrently \"husky install\" \"pnpm build\"", + "prepare": "concurrently \"husky install\" \"pnpm build\"", "pre-commit": "lint-staged" }, "repository": { From 1f3a02559c2dff01248dca79c47a9b6cff86913c Mon Sep 17 00:00:00 2001 From: Alois Klink Date: Thu, 29 Sep 2022 20:11:26 +0100 Subject: [PATCH 3/3] =?UTF-8?q?build:=20lint-staged=20docs=20in=20packages?= =?UTF-8?q?/mermaid/src/=E2=80=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When running lint-staged during git pre-commit scripts, search for docs in the packages/mermaid/src/docs folder instead of the original src/docs folder. --- .lintstagedrc.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.lintstagedrc.json b/.lintstagedrc.json index a6c963ff6..be6e92770 100644 --- a/.lintstagedrc.json +++ b/.lintstagedrc.json @@ -1,6 +1,6 @@ { - "src/docs/**": ["pnpm run docs:build --git"], - "src/docs.mts": ["pnpm run docs:build --git"], + "packages/mermaid/src/docs/**": ["pnpm run docs:build --git"], + "packages/mermaid/src/docs.mts": ["pnpm run docs:build --git"], "*.{ts,js,json,html,md,mts}": ["eslint --fix", "prettier --write"], "*.jison": ["pnpm run lint:jison"] }