From a79a5052cf37fd5c62c94832be6e545c7f620ce0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Syn=C3=A1=C4=8Dek?= Date: Fri, 6 Mar 2026 15:03:11 +0100 Subject: [PATCH 1/3] feat: formatting config --- .github/workflows/controlplane-ci.yaml | 3 +++ .github/workflows/studio-ci.yaml | 6 +++--- .prettierignore | 1 + controlplane/emails/package.json | 4 ++-- shared/.prettierignore | 2 ++ 5 files changed, 11 insertions(+), 5 deletions(-) diff --git a/.github/workflows/controlplane-ci.yaml b/.github/workflows/controlplane-ci.yaml index 8a6a838726..492631a45d 100644 --- a/.github/workflows/controlplane-ci.yaml +++ b/.github/workflows/controlplane-ci.yaml @@ -66,6 +66,9 @@ jobs: - name: Generate email templates run: pnpm run --filter ./controlplane/emails build + - name: Lint & format + run: pnpm run --filter ./controlplane/ lint:fix + - uses: ./.github/actions/git-dirty-check with: package-name: controlplane diff --git a/.github/workflows/studio-ci.yaml b/.github/workflows/studio-ci.yaml index 0cb3c8a60e..c2d70a91d2 100644 --- a/.github/workflows/studio-ci.yaml +++ b/.github/workflows/studio-ci.yaml @@ -43,6 +43,9 @@ jobs: - name: Generate code run: pnpm buf generate --template buf.ts.gen.yaml + - name: Lint + run: pnpm run --filter studio lint:fix + - uses: ./.github/actions/git-dirty-check with: package-name: studio @@ -50,9 +53,6 @@ jobs: - name: Build run: pnpm run --filter ./studio --filter ./connect --filter ./shared --filter ./composition build - - name: Lint - run: pnpm run --filter studio lint - - name: Test run: pnpm run --filter studio test:coverage diff --git a/.prettierignore b/.prettierignore index 470bcb1473..80012cd965 100644 --- a/.prettierignore +++ b/.prettierignore @@ -23,3 +23,4 @@ logs CHANGELOG.md CHANGELOG .husky +**/testdata diff --git a/controlplane/emails/package.json b/controlplane/emails/package.json index 25082dc5b4..3137499313 100644 --- a/controlplane/emails/package.json +++ b/controlplane/emails/package.json @@ -6,9 +6,9 @@ "type": "module", "scripts": { "dev": "email dev --dir src --port 3400", - "build": "email export --dir src --outDir ../src/templates/emails --pretty && pnpm run --filter ../ lint:fix", + "build": "email export --dir src --outDir ../src/templates/emails --pretty", "format": "prettier -w .", - "lint:fix": "eslint --cache --fix --ext .ts,.mjs,.cjs . && pnpm format" + "lint:fix": "eslint --cache --fix --ext .ts,.tsx,.mjs,.cjs . && pnpm format" }, "author": { "name": "WunderGraph Maintainers", diff --git a/shared/.prettierignore b/shared/.prettierignore index 1b763b1bae..055bfeceb4 100644 --- a/shared/.prettierignore +++ b/shared/.prettierignore @@ -1 +1,3 @@ CHANGELOG.md +test/__snapshots__ +test/testdata/*.graphql From 9f18c0bb7558a38e0459178c6b13469170fcab98 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Syn=C3=A1=C4=8Dek?= Date: Fri, 6 Mar 2026 16:24:31 +0100 Subject: [PATCH 2/3] feat: ignore studio formatting for now --- .github/workflows/studio-ci.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/studio-ci.yaml b/.github/workflows/studio-ci.yaml index c2d70a91d2..3e66c2b997 100644 --- a/.github/workflows/studio-ci.yaml +++ b/.github/workflows/studio-ci.yaml @@ -43,8 +43,8 @@ jobs: - name: Generate code run: pnpm buf generate --template buf.ts.gen.yaml - - name: Lint - run: pnpm run --filter studio lint:fix + # - name: Lint + # run: pnpm run --filter studio lint:fix - uses: ./.github/actions/git-dirty-check with: From 473a53d4fa1be96cec9b8ee6700dca85e7f80cd2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Syn=C3=A1=C4=8Dek?= Date: Fri, 6 Mar 2026 16:28:48 +0100 Subject: [PATCH 3/3] fix: do not format testdata at all --- shared/.prettierignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shared/.prettierignore b/shared/.prettierignore index 055bfeceb4..4ec30d5695 100644 --- a/shared/.prettierignore +++ b/shared/.prettierignore @@ -1,3 +1,3 @@ CHANGELOG.md test/__snapshots__ -test/testdata/*.graphql +test/testdata/*