Merge pull request #1459 from pietervdvn/prettier

A bit of housekeeping, focus on Prettier
2023-06-14 20:38:44 +02:00 · 2023-06-14 20:38:44 +02:00 · 5757ae5dea
commit 5757ae5dea
parent 2eabfea8af 1cf0f24d8e
6 changed files with 95 additions and 90 deletions
--- a/.prettierrc.json
+++ b/.prettierrc.json
@ -2,5 +2,7 @@
  "semi": false,
  "printWidth": 100,
  "plugins": ["prettier-plugin-svelte"],
-  "overrides": [{ "files": "*.svelte", "options": { "parser": "svelte" } }]
+  "overrides": [{ "files": "*.svelte", "options": { "parser": "svelte" } }],
+  "svelteBracketNewLine": false,
+  "htmlWhitespaceSensitivity": "ignore"
 }
--- a/UI/BigComponents/ThemeButton.svelte
+++ b/UI/BigComponents/ThemeButton.svelte
@ -1,80 +1,83 @@
 <script lang="ts">
-    import {Translation} from "../i18n/Translation"
-    import * as personal from "../../assets/themes/personal/personal.json"
-    import {ImmutableStore, Store, UIEventSource} from "../../Logic/UIEventSource"
-    import UserDetails, {OsmConnection} from "../../Logic/Osm/OsmConnection"
-    import Constants from "../../Models/Constants"
-    import type {LayoutInformation} from "../../Models/ThemeConfig/LayoutConfig"
-    import Tr from "../Base/Tr.svelte"
-    import SubtleLink from "../Base/SubtleLink.svelte";
+  import { Translation } from "../i18n/Translation"
+  import * as personal from "../../assets/themes/personal/personal.json"
+  import { ImmutableStore, Store, UIEventSource } from "../../Logic/UIEventSource"
+  import UserDetails, { OsmConnection } from "../../Logic/Osm/OsmConnection"
+  import Constants from "../../Models/Constants"
+  import type { LayoutInformation } from "../../Models/ThemeConfig/LayoutConfig"
+  import Tr from "../Base/Tr.svelte"
+  import SubtleLink from "../Base/SubtleLink.svelte"

-    export let theme: LayoutInformation
-    export let isCustom: boolean = false
-    export let userDetails: UIEventSource<UserDetails>
-    export let state: { layoutToUse: {id: string}, osmConnection: OsmConnection }
+  export let theme: LayoutInformation
+  export let isCustom: boolean = false
+  export let userDetails: UIEventSource<UserDetails>
+  export let state: { layoutToUse: { id: string }; osmConnection: OsmConnection }

-    $: title = new Translation(
-        theme.title,
-        !isCustom && !theme.mustHaveLanguage ? "themes:" + theme.id + ".title" : undefined
-    )
-    $: description = new Translation(theme.shortDescription)
+  $: title = new Translation(
+    theme.title,
+    !isCustom && !theme.mustHaveLanguage ? "themes:" + theme.id + ".title" : undefined
+  )
+  $: description = new Translation(theme.shortDescription)

-    // TODO: Improve this function
-    function createUrl(
-        layout: { id: string; definition?: string },
-        isCustom: boolean,
-        state?: { layoutToUse?: { id } }
-    ): Store<string> {
-        if (layout === undefined) {
-            return undefined
-        }
-        if (layout.id === undefined) {
-            console.error("ID is undefined for layout", layout)
-            return undefined
-        }
-
-        if (layout.id === state?.layoutToUse?.id) {
-            return undefined
-        }
-
-
-        let path = window.location.pathname
-        // Path starts with a '/' and contains everything, e.g. '/dir/dir/page.html'
-        path = path.substr(0, path.lastIndexOf("/"))
-        // Path will now contain '/dir/dir', or empty string in case of nothing
-        if (path === "") {
-            path = "."
-        }
-
-        let linkPrefix = `${path}/${layout.id.toLowerCase()}.html?`
-        if (location.hostname === "localhost" || location.hostname === "127.0.0.1" || location.port === "1234") {
-            // Redirect to 'theme.html?layout=* instead of 'layout.html'. This is probably a debug run, where the routing does not work
-            linkPrefix = `${path}/theme.html?layout=${layout.id}&`
-        }
-
-        if (isCustom) {
-            linkPrefix = `${path}/theme.html?userlayout=${layout.id}&`
-        }
-
-        let hash = ""
-        if (layout.definition !== undefined) {
-            hash = "#" + btoa(JSON.stringify(layout.definition))
-        }
-
-        return new ImmutableStore<string>(`${linkPrefix}${hash}`)
+  // TODO: Improve this function
+  function createUrl(
+    layout: { id: string; definition?: string },
+    isCustom: boolean,
+    state?: { layoutToUse?: { id } }
+  ): Store<string> {
+    if (layout === undefined) {
+      return undefined
+    }
+    if (layout.id === undefined) {
+      console.error("ID is undefined for layout", layout)
+      return undefined
    }

-    let href = createUrl(theme, isCustom, state)
+    if (layout.id === state?.layoutToUse?.id) {
+      return undefined
+    }
+
+    let path = window.location.pathname
+    // Path starts with a '/' and contains everything, e.g. '/dir/dir/page.html'
+    path = path.substr(0, path.lastIndexOf("/"))
+    // Path will now contain '/dir/dir', or empty string in case of nothing
+    if (path === "") {
+      path = "."
+    }
+
+    let linkPrefix = `${path}/${layout.id.toLowerCase()}.html?`
+    if (
+      location.hostname === "localhost" ||
+      location.hostname === "127.0.0.1" ||
+      location.port === "1234"
+    ) {
+      // Redirect to 'theme.html?layout=* instead of 'layout.html'. This is probably a debug run, where the routing does not work
+      linkPrefix = `${path}/theme.html?layout=${layout.id}&`
+    }
+
+    if (isCustom) {
+      linkPrefix = `${path}/theme.html?userlayout=${layout.id}&`
+    }
+
+    let hash = ""
+    if (layout.definition !== undefined) {
+      hash = "#" + btoa(JSON.stringify(layout.definition))
+    }
+
+    return new ImmutableStore<string>(`${linkPrefix}${hash}`)
+  }
+
+  let href = createUrl(theme, isCustom, state)
 </script>

 {#if theme.id !== personal.id || $userDetails.csCount > Constants.userJourney.personalLayoutUnlock}
-    <SubtleLink href={$href} options={{extraClasses: "w-full"}}>
-        <img slot="image" src={theme.icon} class="block h-11 w-11 bg-red mx-4" alt=""/>
-        <span class="flex flex-col text-ellipsis overflow-hidden">
-          <Tr t={title}/>
-          <span class="subtle max-h-12 truncate text-ellipsis">
-            <Tr t={description}/>
-          </span>
+  <SubtleLink href={$href} options={{ extraClasses: "w-full" }}>
+    <img slot="image" src={theme.icon} class="block h-11 w-11 mx-4" alt="" />
+    <span class="flex flex-col text-ellipsis overflow-hidden">
+      <Tr t={title} />
+      <span class="subtle max-h-12 truncate text-ellipsis">
+        <Tr t={description} />
      </span>
-    </SubtleLink>
+    </span>
+  </SubtleLink>
 {/if}
--- a/UI/Input/Checkboxes.ts
+++ b/UI/Input/Checkboxes.ts
@ -66,7 +66,7 @@ export default class CheckBoxes extends InputElement<number[]> {
            label.htmlFor = input.id
            label.appendChild(input)
            label.appendChild(inputI.ConstructElement())
-            label.classList.add("block", "w-full", "p-2", "cursor-pointer", "bg-red")
+            label.classList.add("block", "w-full", "p-2", "cursor-pointer")

            formTag.appendChild(label)

--- a/UI/Input/RadioButton.ts
+++ b/UI/Input/RadioButton.ts
@ -118,7 +118,7 @@ export class RadioButton<T> extends InputElement<T> {
            const label = document.createElement("label")
            label.appendChild(labelHtml)
            label.htmlFor = input.id
-            label.classList.add("flex", "w-full", "cursor-pointer", "bg-red")
+            label.classList.add("flex", "w-full", "cursor-pointer")

            if (!this._dontStyle) {
                labelHtml.classList.add("p-2")
--- a/package-lock.json
+++ b/package-lock.json
@ -76,8 +76,8 @@
        "dependency-cruiser": "^10.4.0",
        "fs": "0.0.1-security",
        "node-html-parser": "^6.1.5",
-        "prettier": "^2.7.1",
-        "prettier-plugin-svelte": "^2.9.0",
+        "prettier": "^2.8.8",
+        "prettier-plugin-svelte": "^2.10.1",
        "read-file": "^0.2.0",
        "sass": "^1.58.0",
        "sharp": "^0.30.5",
@ -8552,9 +8552,9 @@
      }
    },
    "node_modules/prettier": {
-      "version": "2.7.1",
-      "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.7.1.tgz",
-      "integrity": "sha512-ujppO+MkdPqoVINuDFDRLClm7D78qbDt0/NR+wp5FqEZOoTNAjPHWj17QRhu7geIHJfcNhRk1XVQmF8Bp3ye+g==",
+      "version": "2.8.8",
+      "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.8.tgz",
+      "integrity": "sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==",
      "dev": true,
      "bin": {
        "prettier": "bin-prettier.js"
@ -8567,13 +8567,13 @@
      }
    },
    "node_modules/prettier-plugin-svelte": {
-      "version": "2.9.0",
-      "resolved": "https://registry.npmjs.org/prettier-plugin-svelte/-/prettier-plugin-svelte-2.9.0.tgz",
-      "integrity": "sha512-3doBi5NO4IVgaNPtwewvrgPpqAcvNv0NwJNflr76PIGgi9nf1oguQV1Hpdm9TI2ALIQVn/9iIwLpBO5UcD2Jiw==",
+      "version": "2.10.1",
+      "resolved": "https://registry.npmjs.org/prettier-plugin-svelte/-/prettier-plugin-svelte-2.10.1.tgz",
+      "integrity": "sha512-Wlq7Z5v2ueCubWo0TZzKc9XHcm7TDxqcuzRuGd0gcENfzfT4JZ9yDlCbEgxWgiPmLHkBjfOtpAWkcT28MCDpUQ==",
      "dev": true,
      "peerDependencies": {
        "prettier": "^1.16.4 || ^2.0.0",
-        "svelte": "^3.2.0"
+        "svelte": "^3.2.0 || ^4.0.0-next.0"
      }
    },
    "node_modules/pretty-format": {
@ -18523,15 +18523,15 @@
      "integrity": "sha512-ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w=="
    },
    "prettier": {
-      "version": "2.7.1",
-      "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.7.1.tgz",
-      "integrity": "sha512-ujppO+MkdPqoVINuDFDRLClm7D78qbDt0/NR+wp5FqEZOoTNAjPHWj17QRhu7geIHJfcNhRk1XVQmF8Bp3ye+g==",
+      "version": "2.8.8",
+      "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.8.tgz",
+      "integrity": "sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==",
      "dev": true
    },
    "prettier-plugin-svelte": {
-      "version": "2.9.0",
-      "resolved": "https://registry.npmjs.org/prettier-plugin-svelte/-/prettier-plugin-svelte-2.9.0.tgz",
-      "integrity": "sha512-3doBi5NO4IVgaNPtwewvrgPpqAcvNv0NwJNflr76PIGgi9nf1oguQV1Hpdm9TI2ALIQVn/9iIwLpBO5UcD2Jiw==",
+      "version": "2.10.1",
+      "resolved": "https://registry.npmjs.org/prettier-plugin-svelte/-/prettier-plugin-svelte-2.10.1.tgz",
+      "integrity": "sha512-Wlq7Z5v2ueCubWo0TZzKc9XHcm7TDxqcuzRuGd0gcENfzfT4JZ9yDlCbEgxWgiPmLHkBjfOtpAWkcT28MCDpUQ==",
      "dev": true,
      "requires": {}
    },
--- a/package.json
+++ b/package.json
@ -39,7 +39,7 @@
    "generate": "mkdir -p ./assets/generated; npm run generate:licenses; npm run generate:images; npm run generate:charging-stations; npm run generate:translations; npm run reset:layeroverview; npm run generate:service-worker",
    "generate:charging-stations": "cd ./assets/layers/charging_station && vite-node csvToJson.ts && cd -",
    "prepare-deploy": "npm run generate:service-worker && ./scripts/build.sh",
-    "format": "npx prettier --write --svelte-bracket-new-line=false --html-whitespace-sensitivity=ignore '**/*.ts' '**/*.svelte'",
+    "format": "prettier --write '**/*.ts' '**/*.svelte'",
    "clean:tests": "(find . -type f -name \"*.doctest.ts\" | xargs -r rm)",
    "clean": "rm -rf .cache/ && (find *.html | grep -v \"^\\(404\\|index\\|land\\|test\\|preferences\\|customGenerator\\|professional\\|automaton\\|import_helper\\|import_viewer\\|theme\\|style_test\\).html\" | xargs -r rm) && (ls | grep \"^index_[a-zA-Z_-]\\+\\.ts$\" | xargs -r rm) && (ls | grep \".*.webmanifest$\" | grep -v \"manifest.webmanifest\" | xargs -r rm)",
    "generate:dependency-graph": "node_modules/.bin/depcruise --exclude \"^node_modules\" --output-type dot Logic/State/MapState.ts > dependencies.dot && dot dependencies.dot -T svg -o dependencies.svg && rm dependencies.dot",
@ -128,8 +128,8 @@
    "dependency-cruiser": "^10.4.0",
    "fs": "0.0.1-security",
    "node-html-parser": "^6.1.5",
-    "prettier": "^2.7.1",
-    "prettier-plugin-svelte": "^2.9.0",
+    "prettier": "^2.8.8",
+    "prettier-plugin-svelte": "^2.10.1",
    "read-file": "^0.2.0",
    "sass": "^1.58.0",
    "sharp": "^0.30.5",