From 5b9db600a6070692cd4a96379b6b9dcb6e88998b Mon Sep 17 00:00:00 2001
From: Dorian Ignee <dorian.ignee@posterselect.de>
Date: Wed, 11 Dec 2024 15:21:49 +0100
Subject: [PATCH] chore: Prettier config

change prettierconfig to match code format
add prettierconfig to scripts
---
 .prettierconfig.yaml   | 12 ++++++------
 package-lock.json      |  6 ++++--
 package.json           |  5 +++--
 web/src/pico/pico.scss |  4 ++--
 4 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/.prettierconfig.yaml b/.prettierconfig.yaml
index 1692bd146..2558f6915 100644
--- a/.prettierconfig.yaml
+++ b/.prettierconfig.yaml
@@ -2,23 +2,23 @@ arrowParens: "always" # default
 bracketSameLine: false # default
 bracketSpacing: true # default
 embeddedLanguageFormatting: "auto" # default
-endOfLine: "lf" # default
+endOfLine: "auto" # default is "lf"
 filepath: "" # default
 htmlWhitespaceSensitivity: "css" # default
 insertPragma: false # default
-jsxBracketSameLine: false # default
+# jsxBracketSameLine: false # deprecated
 jsxSingleQuote: false # default
 parser: "" # default
-printWidth: 80 # Default
+printWidth: 80 # default
 proseWrap: "preserve" # default
 quoteProps: "as-needed" # default
-rangeEnd: Infinity # default
+# rangeEnd: Infinity # default; "Infinity" can't be read as int
 rangeStart: 0 # default
 requirePragma: false # default
 semi: true # default
-singleAttributePerLine: "false" # default
+singleAttributePerLine: false # default
 singleQuote: false # default
 tabWidth: 2 # default
-trailingComma: "es5" # default
+trailingComma: "all" # default is "es5"
 useTabs: false # default
 vueIndentScriptAndStyle: false # default
diff --git a/package-lock.json b/package-lock.json
index 97b646a15..ce89dacd4 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -21,6 +21,7 @@
       "devDependencies": {
         "concurrently": "^9.0.1",
         "cross-env": "^7.0.3",
+        "prettier": "^3.4.2",
         "shx": "^0.3.4"
       },
       "engines": {
@@ -16614,9 +16615,10 @@
       }
     },
     "node_modules/prettier": {
-      "version": "3.3.3",
+      "version": "3.4.2",
+      "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.4.2.tgz",
+      "integrity": "sha512-e9MewbtFo+Fevyuxn/4rrcDAaq0IYxPGLvObpQjiZBMAzB9IGmzlnG9RZy3FFas+eBMu2vA0CszMeduow5dIuQ==",
       "dev": true,
-      "license": "MIT",
       "bin": {
         "prettier": "bin/prettier.cjs"
       },
diff --git a/package.json b/package.json
index e9fe5325b..353eac00b 100644
--- a/package.json
+++ b/package.json
@@ -19,9 +19,9 @@
     "precheck": "npm -w web run extract && npm -w web run lingui",
     "check": "npm run check:format && npm run check:types && npm run check:lint",
     "clean": "shx rm -rf **/node_modules **/tsconfig.tsbuildinfo **/build",
-    "format": "prettier --write cli/src components/src extension/src projects/src runner/src simulator/src web/src",
+    "format": "prettier --config .prettierconfig.yaml --write cli/src components/src extension/src projects/src runner/src simulator/src web/src",
     "fix": "eslint --fix cli/src components/src extension/src projects/src runner/src simulator/src web/src",
-    "check:format": "prettier --ignore-unknown --check cli/src components/src extension/src projects/src runner/src simulator/src web/src web/public",
+    "check:format": "prettier --ignore-unknown --config .prettierconfig.yaml --check cli/src components/src extension/src projects/src runner/src simulator/src web/src web/public",
     "check:lint": "eslint --no-error-on-unmatched-pattern cli/src components/src extension/src projects/src runner/src simulator/src web/src web/public",
     "precheck:types": "npm run build -w projects && npm run build -w runner && npm run build -w simulator && npm run build -w components",
     "check:types": "tsc --build tsconfig.json",
@@ -54,6 +54,7 @@
   "devDependencies": {
     "concurrently": "^9.0.1",
     "cross-env": "^7.0.3",
+    "prettier": "^3.4.2",
     "shx": "^0.3.4"
   }
 }
diff --git a/web/src/pico/pico.scss b/web/src/pico/pico.scss
index ff0bab114..ca520adb2 100644
--- a/web/src/pico/pico.scss
+++ b/web/src/pico/pico.scss
@@ -18,8 +18,8 @@
     /* .75rem */
     --form-element-spacing-horizontal: 0.25rem;
     /* 1rem */
-    --font-family: Poppins, system-ui, -apple-system, "Segoe UI", Roboto, Oxygen,
-      Ubuntu, Cantarell, "Noto Sans", sans-serif, "Apple Color Emoji",
+    --font-family: Poppins, system-ui, -apple-system, "Segoe UI", Roboto,
+      Oxygen, Ubuntu, Cantarell, "Noto Sans", sans-serif, "Apple Color Emoji",
       "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
     --font-size-monospace: 16px;
     --font-family-monospace: "JetBrains Mono", source-code-pro, Menlo, Monaco,