Merge branch 'main' into feat/backport-schema-changes

dasch-swiss · Jul 31, 2024 · 0ca18fd · 0ca18fd
2 parents bfcc164 + c95c691
commit 0ca18fd
Show file tree

Hide file tree

Showing 31 changed files with 3,257 additions and 902 deletions.
diff --git a/justfile b/justfile
@@ -17,6 +17,7 @@ check:
 # Format all rust code
 fmt:
     cargo +nightly fmt
+    cd web-frontend && yarn fmt
 
 # Fix justfile formating. Warning: will change existing file. Please first use check.
 fix:

diff --git a/web-frontend/.prettierrc.json b/web-frontend/.prettierrc.json
@@ -1,7 +1,9 @@
 {
-    "singleQuote": true,
-    "svelteAllowShorthand": true,
-    "allowShorthand": true,
-    "svelteBracketNewLine": false,
-    "svelteStrictMode": false
+  "plugins": ["prettier-plugin-svelte"],
+  "overrides": [{ "files": "*.svelte", "options": { "parser": "svelte" } }],
+  "singleQuote": true,
+  "svelteAllowShorthand": true,
+  "allowShorthand": true,
+  "svelteBracketNewLine": false,
+  "svelteStrictMode": false
 }