Radish alpha
r
Radicle web interface
Radicle
Git (anonymous pull)
Log in to clone via SSH
Add prettier
Rūdolfs Ošiņš committed 3 years ago
commit 687174a8e0019b7866904dcec7d2ef829a4ebc70
parent 19d24340d9676bab5870e9f436e9bf7bdb1c773d
5 files changed +52 -14
modified .eslintrc.json
@@ -11,14 +11,9 @@
  "parser": "@typescript-eslint/parser",
  "parserOptions": {
    "ecmaVersion": 2020,
-
    "sourceType": "module",
-
    "extraFileExtensions": [".svelte"]
+
    "sourceType": "module"
  },
-
  "plugins": [
-
    "svelte3",
-
    "@typescript-eslint",
-
    "radicle"
-
  ],
+
  "plugins": ["svelte3", "@typescript-eslint"],
  "overrides": [
    {
      "files": ["*.svelte"],
@@ -26,8 +21,6 @@
    }
  ],
  "rules": {
-
    "radicle/space-after-unary": ["error"],
-
    "indent": ["error", 2, { "SwitchCase": 1 }],
    "semi": "off",
    "curly": ["error", "multi-line", "consistent"],
    "keyword-spacing": ["error"],
added .prettierrc
@@ -0,0 +1,9 @@
+
{
+
  "arrowParens": "avoid",
+
  "trailingComma": "all",
+
  "plugins": ["prettier-plugin-svelte"],
+
  "svelteSortOrder" : "options-scripts-styles-markup",
+
  "bracketSameLine": true,
+
  "proseWrap": "never",
+
  "htmlWhitespaceSensitivity": "ignore"
+
}
modified package-lock.json
@@ -34,6 +34,8 @@
        "md5": "^2.3.0",
        "multibase": "^4.0.4",
        "multihashes": "^4.0.2",
+
        "prettier": "^2.7.1",
+
        "prettier-plugin-svelte": "^2.7.0",
        "pure-svg-code": "^1.0.6",
        "siwe": "^2.0.5",
        "svelte": "^3.49.0",
@@ -9391,6 +9393,29 @@
        "node": ">= 0.8.0"
      }
    },
+
    "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==",
+
      "bin": {
+
        "prettier": "bin-prettier.js"
+
      },
+
      "engines": {
+
        "node": ">=10.13.0"
+
      },
+
      "funding": {
+
        "url": "https://github.com/prettier/prettier?sponsor=1"
+
      }
+
    },
+
    "node_modules/prettier-plugin-svelte": {
+
      "version": "2.7.0",
+
      "resolved": "https://registry.npmjs.org/prettier-plugin-svelte/-/prettier-plugin-svelte-2.7.0.tgz",
+
      "integrity": "sha512-fQhhZICprZot2IqEyoiUYLTRdumULGRvw0o4dzl5jt0jfzVWdGqeYW27QTWAeXhoupEZJULmNoH3ueJwUWFLIA==",
+
      "peerDependencies": {
+
        "prettier": "^1.16.4 || ^2.0.0",
+
        "svelte": "^3.2.0"
+
      }
+
    },
    "node_modules/pretty-bytes": {
      "version": "5.6.0",
      "resolved": "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-5.6.0.tgz",
@@ -18767,6 +18792,17 @@
      "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==",
      "dev": true
    },
+
    "prettier": {
+
      "version": "2.7.1",
+
      "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.7.1.tgz",
+
      "integrity": "sha512-ujppO+MkdPqoVINuDFDRLClm7D78qbDt0/NR+wp5FqEZOoTNAjPHWj17QRhu7geIHJfcNhRk1XVQmF8Bp3ye+g=="
+
    },
+
    "prettier-plugin-svelte": {
+
      "version": "2.7.0",
+
      "resolved": "https://registry.npmjs.org/prettier-plugin-svelte/-/prettier-plugin-svelte-2.7.0.tgz",
+
      "integrity": "sha512-fQhhZICprZot2IqEyoiUYLTRdumULGRvw0o4dzl5jt0jfzVWdGqeYW27QTWAeXhoupEZJULmNoH3ueJwUWFLIA==",
+
      "requires": {}
+
    },
    "pretty-bytes": {
      "version": "5.6.0",
      "resolved": "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-5.6.0.tgz",
modified package.json
@@ -66,6 +66,8 @@
    "md5": "^2.3.0",
    "multibase": "^4.0.4",
    "multihashes": "^4.0.2",
+
    "prettier": "^2.7.1",
+
    "prettier-plugin-svelte": "^2.7.0",
    "pure-svg-code": "^1.0.6",
    "siwe": "^2.0.5",
    "svelte": "^3.49.0",
modified scripts/check-format
@@ -1,7 +1,5 @@
-
#!/bin/sh
-
set -e
+
#!/bin/bash
+
set -euo pipefail

-
# Checks local /node_modules,
-
# if not found will download that package and execute it.
-
# Does not modify files, informs bad code format
npx eslint .
+
npx prettier "**/*.@(ts|js|svelte|json|css|html)" --ignore-path .gitignore --check