From 3f3000d71318df7295710e8ec571684f4bebb403 Mon Sep 17 00:00:00 2001 From: Felix Kling Date: Thu, 21 Dec 2023 12:06:06 +0100 Subject: [PATCH] svelte: Use same prettier version as workspace root (#59160) If we are not using the same version there will be differences between running `pnpm format` in the SvelteKit package and `sg lint format`, which will cause CI to fail (which is annoying). --- client/web-sveltekit/.prettierignore | 3 +++ client/web-sveltekit/package.json | 4 ++-- client/web-sveltekit/src/app.html | 2 +- .../src/lib/repo/FileTable.svelte | 4 ++-- .../src/lib/search/input/SearchInput.svelte | 2 +- .../src/lib/wildcard/Badge.svelte | 2 +- .../src/lib/wildcard/Button.svelte | 6 ++--- .../src/lib/wildcard/ButtonGroup.svelte | 2 +- .../src/stories/BadgeExample.svelte | 2 +- .../src/stories/ForceUpdate.svelte | 1 - pnpm-lock.yaml | 24 +++++++------------ 11 files changed, 24 insertions(+), 28 deletions(-) diff --git a/client/web-sveltekit/.prettierignore b/client/web-sveltekit/.prettierignore index d09823d033d..3e91d13034d 100644 --- a/client/web-sveltekit/.prettierignore +++ b/client/web-sveltekit/.prettierignore @@ -13,5 +13,8 @@ pnpm-lock.yaml package-lock.json yarn.lock /static/mockServiceWorker.js +.gql.d.ts +graphql-operations.ts +graphql-types.ts tsconfig.json diff --git a/client/web-sveltekit/package.json b/client/web-sveltekit/package.json index b1326b371f6..9e26b282f6d 100644 --- a/client/web-sveltekit/package.json +++ b/client/web-sveltekit/package.json @@ -47,8 +47,8 @@ "graphql": "^15.0.0", "msw": "^1.2.3", "msw-storybook-addon": "^1.8.0", - "prettier": "^3.0.0", - "prettier-plugin-svelte": "^3.0.3", + "prettier": "2.8.1", + "prettier-plugin-svelte": "^2.0.0", "react": "^18.2.0", "react-dom": "^18.2.0", "signale": "^1.4.0", diff --git a/client/web-sveltekit/src/app.html b/client/web-sveltekit/src/app.html index 7a7e97215b1..02b1c75e6dd 100644 --- a/client/web-sveltekit/src/app.html +++ b/client/web-sveltekit/src/app.html @@ -1,4 +1,4 @@ - + diff --git a/client/web-sveltekit/src/lib/repo/FileTable.svelte b/client/web-sveltekit/src/lib/repo/FileTable.svelte index 27d3f179618..441c6f36ff0 100644 --- a/client/web-sveltekit/src/lib/repo/FileTable.svelte +++ b/client/web-sveltekit/src/lib/repo/FileTable.svelte @@ -43,8 +43,8 @@ {:else} - - + + {/if} {/if} diff --git a/client/web-sveltekit/src/lib/search/input/SearchInput.svelte b/client/web-sveltekit/src/lib/search/input/SearchInput.svelte index 12a2990218f..c39e20c9cc1 100644 --- a/client/web-sveltekit/src/lib/search/input/SearchInput.svelte +++ b/client/web-sveltekit/src/lib/search/input/SearchInput.svelte @@ -169,7 +169,7 @@ >
-
+
diff --git a/client/web-sveltekit/src/stories/BadgeExample.svelte b/client/web-sveltekit/src/stories/BadgeExample.svelte index 0ffaf7d8ddd..8b1c5d511b5 100644 --- a/client/web-sveltekit/src/stories/BadgeExample.svelte +++ b/client/web-sveltekit/src/stories/BadgeExample.svelte @@ -5,7 +5,7 @@

Default

- + {#each BADGE_VARIANTS as variant} diff --git a/client/web-sveltekit/src/stories/ForceUpdate.svelte b/client/web-sveltekit/src/stories/ForceUpdate.svelte index d5f2588ef39..a5293496759 100644 --- a/client/web-sveltekit/src/stories/ForceUpdate.svelte +++ b/client/web-sveltekit/src/stories/ForceUpdate.svelte @@ -2,7 +2,6 @@ @component Decorator for forcing the story component to be destroyed an recreated --> -
Variantpill=truesmall=truepill=true small=true
Variantpill=truesmall=truepill=true small=true