diff --git a/gui/.eslintrc.json b/gui/.eslintrc.json index e40559ef9..171e761e6 100644 --- a/gui/.eslintrc.json +++ b/gui/.eslintrc.json @@ -4,11 +4,7 @@ "es2021": true, "jest": true }, - "extends": [ - "eslint:recommended", - "plugin:@typescript-eslint/recommended", - "prettier" - ], + "extends": ["eslint:recommended", "plugin:@typescript-eslint/recommended"], "parser": "@typescript-eslint/parser", "parserOptions": { "ecmaFeatures": { @@ -17,7 +13,7 @@ "ecmaVersion": "latest", "sourceType": "module" }, - "plugins": ["react-hooks", "@typescript-eslint", "prettier"], + "plugins": ["react-hooks", "@typescript-eslint"], "rules": { "react/react-in-jsx-scope": "off", "react/prop-types": "off", @@ -27,7 +23,6 @@ "no-inline-styles": "off", "@typescript-eslint/no-explicit-any": "off", "react/no-unescaped-entities": "off", - "prettier/prettier": "warn", "camelcase": "error", "@typescript-eslint/no-unused-vars": [ "warn", diff --git a/gui/package.json b/gui/package.json index 6c42f3d65..a7a0ce8ed 100644 --- a/gui/package.json +++ b/gui/package.json @@ -37,7 +37,7 @@ "dev": "tauri dev", "skipbundler": "tauri build -b none", "tauri": "tauri", - "lint": "eslint \"src/**/*.{js,jsx,ts,tsx,json}\"", + "lint": "eslint \"src/**/*.{js,jsx,ts,tsx,json}\" && prettier --check \"src/**/*.{js,jsx,ts,tsx,css,md,json}\"", "lint:fix": "eslint --fix \"src/**/*.{js,jsx,ts,tsx,json}\"", "format": "prettier --write \"src/**/*.{js,jsx,ts,tsx,css,md,json}\"", "preview-vite": "vite preview", @@ -73,11 +73,9 @@ "cross-env": "^7.0.3", "eslint": "^8.18.0", "eslint-config-airbnb": "^19.0.4", - "eslint-config-prettier": "^8.5.0", "eslint-import-resolver-typescript": "^3.1.1", "eslint-plugin-import": "^2.26.0", "eslint-plugin-jsx-a11y": "^6.6.0", - "eslint-plugin-prettier": "^4.1.0", "eslint-plugin-react": "^7.30.1", "eslint-plugin-react-hooks": "^4.6.0", "postcss": "^8.4.12", diff --git a/gui/src/components/onboarding/pages/ConnectTracker.tsx b/gui/src/components/onboarding/pages/ConnectTracker.tsx index e3149f7fb..3ef47d7be 100644 --- a/gui/src/components/onboarding/pages/ConnectTracker.tsx +++ b/gui/src/components/onboarding/pages/ConnectTracker.tsx @@ -7,7 +7,7 @@ import { StartWifiProvisioningRequestT, StopWifiProvisioningRequestT, WifiProvisioningStatus, - WifiProvisioningStatusResponseT + WifiProvisioningStatusResponseT, } from 'solarxr-protocol'; import { useLayout } from '../../../hooks/layout'; import { useOnboarding } from '../../../hooks/onboarding'; diff --git a/gui/src/components/tracker/TrackersTable.tsx b/gui/src/components/tracker/TrackersTable.tsx index d25c93d6e..a3bc7181e 100644 --- a/gui/src/components/tracker/TrackersTable.tsx +++ b/gui/src/components/tracker/TrackersTable.tsx @@ -5,7 +5,7 @@ import { MouseEventHandler, ReactNode, useMemo, useState } from 'react'; import { TrackerDataT, TrackerIdT, - TrackerStatus as TrackerStatusEnum + TrackerStatus as TrackerStatusEnum, } from 'solarxr-protocol'; import { FlatDeviceTracker } from '../../hooks/app'; import { useConfig } from '../../hooks/config'; diff --git a/gui/src/components/widgets/OverlayWidget.tsx b/gui/src/components/widgets/OverlayWidget.tsx index fb010339d..5f96190ea 100644 --- a/gui/src/components/widgets/OverlayWidget.tsx +++ b/gui/src/components/widgets/OverlayWidget.tsx @@ -5,7 +5,7 @@ import { KeyValuesT, MessageT, Payload, Topic } from 'solarxr-protocol'; import { OVERLAY_DISPLAY_SETTINGS_TOPIC, PayloadData, - usePubSub + usePubSub, } from '../../hooks/pubSub'; import { CheckBox } from '../commons/Checkbox'; import { Typography } from '../commons/Typography'; diff --git a/package-lock.json b/package-lock.json index 962cbce00..05d62ef96 100644 --- a/package-lock.json +++ b/package-lock.json @@ -62,11 +62,9 @@ "cross-env": "^7.0.3", "eslint": "^8.18.0", "eslint-config-airbnb": "^19.0.4", - "eslint-config-prettier": "^8.5.0", "eslint-import-resolver-typescript": "^3.1.1", "eslint-plugin-import": "^2.26.0", "eslint-plugin-jsx-a11y": "^6.6.0", - "eslint-plugin-prettier": "^4.1.0", "eslint-plugin-react": "^7.30.1", "eslint-plugin-react-hooks": "^4.6.0", "postcss": "^8.4.12", @@ -4911,18 +4909,6 @@ "semver": "bin/semver.js" } }, - "node_modules/eslint-config-prettier": { - "version": "8.6.0", - "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-8.6.0.tgz", - "integrity": "sha512-bAF0eLpLVqP5oEVUFKpMA+NnRFICwn9X8B5jrR9FcqnYBuPbqWEjTEspPWMj5ye6czoSLDweCzSo3Ko7gGrZaA==", - "dev": true, - "bin": { - "eslint-config-prettier": "bin/cli.js" - }, - "peerDependencies": { - "eslint": ">=7.0.0" - } - }, "node_modules/eslint-config-react-app": { "version": "7.0.1", "resolved": "https://registry.npmjs.org/eslint-config-react-app/-/eslint-config-react-app-7.0.1.tgz", @@ -5185,27 +5171,6 @@ "semver": "bin/semver.js" } }, - "node_modules/eslint-plugin-prettier": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-4.2.1.tgz", - "integrity": "sha512-f/0rXLXUt0oFYs8ra4w49wYZBG5GKZpAYsJSm6rnYL5uVDjd+zowwMwVZHnAjf4edNrKpCDYfXDgmRE/Ak7QyQ==", - "dev": true, - "dependencies": { - "prettier-linter-helpers": "^1.0.0" - }, - "engines": { - "node": ">=12.0.0" - }, - "peerDependencies": { - "eslint": ">=7.28.0", - "prettier": ">=2.0.0" - }, - "peerDependenciesMeta": { - "eslint-config-prettier": { - "optional": true - } - } - }, "node_modules/eslint-plugin-react": { "version": "7.32.1", "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.32.1.tgz", @@ -5436,12 +5401,6 @@ "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==" }, - "node_modules/fast-diff": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/fast-diff/-/fast-diff-1.2.0.tgz", - "integrity": "sha512-xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w==", - "dev": true - }, "node_modules/fast-glob": { "version": "3.2.12", "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.12.tgz", @@ -8006,18 +7965,6 @@ "url": "https://github.com/prettier/prettier?sponsor=1" } }, - "node_modules/prettier-linter-helpers": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/prettier-linter-helpers/-/prettier-linter-helpers-1.0.0.tgz", - "integrity": "sha512-GbK2cP9nraSSUF9N2XwUwqfzlAFlMNYYl+ShE/V+H8a9uNl/oUqB1w2EL54Jh0OlyRSd8RfWYJ3coVS4TROP2w==", - "dev": true, - "dependencies": { - "fast-diff": "^1.1.2" - }, - "engines": { - "node": ">=6.0.0" - } - }, "node_modules/pretty-quick": { "version": "3.1.3", "resolved": "https://registry.npmjs.org/pretty-quick/-/pretty-quick-3.1.3.tgz", @@ -12908,13 +12855,6 @@ } } }, - "eslint-config-prettier": { - "version": "8.6.0", - "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-8.6.0.tgz", - "integrity": "sha512-bAF0eLpLVqP5oEVUFKpMA+NnRFICwn9X8B5jrR9FcqnYBuPbqWEjTEspPWMj5ye6czoSLDweCzSo3Ko7gGrZaA==", - "dev": true, - "requires": {} - }, "eslint-config-react-app": { "version": "7.0.1", "resolved": "https://registry.npmjs.org/eslint-config-react-app/-/eslint-config-react-app-7.0.1.tgz", @@ -13107,15 +13047,6 @@ } } }, - "eslint-plugin-prettier": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-4.2.1.tgz", - "integrity": "sha512-f/0rXLXUt0oFYs8ra4w49wYZBG5GKZpAYsJSm6rnYL5uVDjd+zowwMwVZHnAjf4edNrKpCDYfXDgmRE/Ak7QyQ==", - "dev": true, - "requires": { - "prettier-linter-helpers": "^1.0.0" - } - }, "eslint-plugin-react": { "version": "7.32.1", "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.32.1.tgz", @@ -13275,12 +13206,6 @@ "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==" }, - "fast-diff": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/fast-diff/-/fast-diff-1.2.0.tgz", - "integrity": "sha512-xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w==", - "dev": true - }, "fast-glob": { "version": "3.2.12", "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.12.tgz", @@ -14954,15 +14879,6 @@ "integrity": "sha512-tJ/oJ4amDihPoufT5sM0Z1SKEuKay8LfVAMlbbhnnkvt6BUserZylqo2PN+p9KeljLr0OHa2rXHU1T8reeoTrw==", "dev": true }, - "prettier-linter-helpers": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/prettier-linter-helpers/-/prettier-linter-helpers-1.0.0.tgz", - "integrity": "sha512-GbK2cP9nraSSUF9N2XwUwqfzlAFlMNYYl+ShE/V+H8a9uNl/oUqB1w2EL54Jh0OlyRSd8RfWYJ3coVS4TROP2w==", - "dev": true, - "requires": { - "fast-diff": "^1.1.2" - } - }, "pretty-quick": { "version": "3.1.3", "resolved": "https://registry.npmjs.org/pretty-quick/-/pretty-quick-3.1.3.tgz", @@ -15482,12 +15398,10 @@ "cross-env": "^7.0.3", "eslint": "^8.18.0", "eslint-config-airbnb": "^19.0.4", - "eslint-config-prettier": "^8.5.0", "eslint-config-react-app": "^7.0.0", "eslint-import-resolver-typescript": "^3.1.1", "eslint-plugin-import": "^2.26.0", "eslint-plugin-jsx-a11y": "^6.6.0", - "eslint-plugin-prettier": "^4.1.0", "eslint-plugin-react": "^7.30.1", "eslint-plugin-react-hooks": "^4.6.0", "flatbuffers": "^22.10.26",