chore: web: format with prettier and lint with eslint (#224)

crlssn · Dec 15, 2024 · cc17946 · cc17946
1 parent 0a519e1
commit cc17946
Show file tree

Hide file tree

Showing 12 changed files with 27 additions and 199 deletions.
diff --git a/.github/workflows/test.web.yml b/.github/workflows/test.web.yml
@@ -24,12 +24,14 @@ jobs:
       - name: Install dependencies
         working-directory: ./web
         run: npm install
-        shell: bash
+
+      - name: Run linter
+        working-directory: ./web
+        run: npm run lint
 
       - name: Run formatter
         working-directory: ./web
         run: npm run format
-        shell: bash
 
       - name: Check for uncommitted changes
         run: |
@@ -41,4 +43,3 @@ jobs:
       - name: Build the app
         working-directory: ./web
         run: npm run build
-        shell: bash
diff --git a/Makefile b/Makefile
@@ -46,6 +46,7 @@ format:
 lint:
 	golangci-lint run
 	buf lint
+	cd web && npm run lint
 
 vet:
 	go vet ./...
diff --git a/web/.prettierrc.json b/web/.prettierrc.json
@@ -1,4 +1,3 @@
-
 {
   "$schema": "https://json.schemastore.org/prettierrc",
   "semi": false,

diff --git a/web/env.d.ts b/web/env.d.ts
@@ -1,9 +1,9 @@
 /// <reference types="vite/client" />
 
 interface ImportMetaEnv {
-  readonly VITE_API_URL: string;
+  readonly VITE_API_URL: string
 }
 
 interface ImportMeta {
-  readonly env: ImportMetaEnv;
+  readonly env: ImportMetaEnv
 }
diff --git a/web/eslint.config.js b/web/eslint.config.js
@@ -1,6 +1,4 @@
-import pluginVue from 'eslint-plugin-vue'
 import pluginVitest from '@vitest/eslint-plugin'
-import perfectionist from 'eslint-plugin-perfectionist'
 import vueTsEslintConfig from '@vue/eslint-config-typescript'
 
 export default [
@@ -14,46 +12,10 @@ export default [
     name: 'app/files-to-ignore',
   },
 
-  ...pluginVue.configs['flat/recommended'],
   ...vueTsEslintConfig(),
 
   {
     ...pluginVitest.configs.recommended,
     files: ['src/**/__tests__/*'],
   },
-
-
-  {
-    plugins: {
-      perfectionist,
-    },
-    rules: {
-      'perfectionist/sort-array-includes': ['error'],
-      'perfectionist/sort-classes': ['error'],
-      'perfectionist/sort-decorators': ['error'],
-      'perfectionist/sort-enums': ['error'],
-      'perfectionist/sort-exports': ['error'],
-      'perfectionist/sort-heritage-clauses': ['error'],
-      'perfectionist/sort-imports': [
-        'error',
-        {
-          order: 'asc',
-          type: 'line-length',
-        },
-      ],
-      'perfectionist/sort-interfaces': ['error'],
-      'perfectionist/sort-intersection-types': ['error'],
-      'perfectionist/sort-jsx-props': ['error'],
-      'perfectionist/sort-maps': ['error'],
-      'perfectionist/sort-modules': ['error'],
-      'perfectionist/sort-named-exports': ['error'],
-      'perfectionist/sort-named-imports': ['error'],
-      'perfectionist/sort-object-types': ['error'],
-      'perfectionist/sort-objects': ['error'],
-      'perfectionist/sort-sets': ['error'],
-      'perfectionist/sort-switch-case': ['error'],
-      'perfectionist/sort-union-types': ['error'],
-      'perfectionist/sort-variable-declarations': ['error'],
-    },
-  }
 ]
diff --git a/web/index.html b/web/index.html
@@ -1,9 +1,12 @@
-<!DOCTYPE html>
+<!doctype html>
 <html lang="" class="h-full bg-gray-100">
   <head>
-    <meta charset="UTF-8">
-    <link rel="icon" href="/favicon.png">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">
+    <meta charset="UTF-8" />
+    <link rel="icon" href="/favicon.png" />
+    <meta
+      name="viewport"
+      content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no"
+    />
     <title>GetStronger</title>
   </head>
   <body class="h-full" id="app">

diff --git a/web/package-lock.json b/web/package-lock.json
diff --git a/web/package.json b/web/package.json
@@ -10,8 +10,8 @@
     "test:unit": "vitest",
     "build-only": "vite build",
     "type-check": "vue-tsc --build --force",
-    "lint": "eslint  --fix",
-    "format": "prettier --write src"
+    "lint": "eslint .",
+    "format": "prettier --write ."
   },
   "dependencies": {
     "@bufbuild/protobuf": "2.2.3",
@@ -53,8 +53,6 @@
     "autoprefixer": "10.4.20",
     "eslint": "9.16.0",
     "eslint-plugin-import": "2.31.0",
-    "eslint-plugin-perfectionist": "4.3.0",
-    "eslint-plugin-vue": "9.32.0",
     "jsdom": "25.0.1",
     "npm-run-all2": "7.0.1",
     "postcss": "8.4.49",

diff --git a/web/src/ui/users/UserPersonalBests.vue b/web/src/ui/users/UserPersonalBests.vue
@@ -1,13 +1,12 @@
 <script setup lang="ts">
-import AppListItem from '@/ui/components/AppListItem.vue'
 import AppList from '@/ui/components/AppList.vue'
 import { onMounted, ref } from 'vue'
 import type { PersonalBest } from '@/proto/api/v1/exercise_service_pb.ts'
 import { getPersonalBests } from '@/http/requests.ts'
 import { useRoute } from 'vue-router'
 import { usePageTitleStore } from '@/stores/pageTitle.ts'
 import AppListItemLink from '@/ui/components/AppListItemLink.vue'
-import { formatToRelativeDateTime, formatUnixToRelativeDateTime } from '@/utils/datetime.ts'
+import { formatToRelativeDateTime } from '@/utils/datetime.ts'
 
 const props = defineProps<{
   id: string

diff --git a/web/tsconfig.app.json b/web/tsconfig.app.json
@@ -1,7 +1,6 @@
 {
   "extends": "@vue/tsconfig/tsconfig.dom.json",
-  "include": [
-    "env.d.ts", "src/**/*", "src/**/*.vue"],
+  "include": ["env.d.ts", "src/**/*", "src/**/*.vue"],
   "exclude": ["src/**/__tests__/*"],
   "compilerOptions": {
     "composite": true,

diff --git a/web/tsconfig.node.json b/web/tsconfig.node.json
@@ -1,9 +1,6 @@
 {
   "extends": "@tsconfig/node20/tsconfig.json",
-  "include": [
-    "vite.config.*",
-    "vitest.config.*",
-  ],
+  "include": ["vite.config.*", "vitest.config.*"],
   "compilerOptions": {
     "composite": true,
     "noEmit": true,

diff --git a/web/vite.config.ts b/web/vite.config.ts
@@ -24,7 +24,7 @@ export default defineConfig({
   },
   resolve: {
     alias: {
-      '@': fileURLToPath(new URL('./src', import.meta.url))
+      '@': fileURLToPath(new URL('./src', import.meta.url)),
     },
   },
 })