Skip to content

Commit 1e2b5a4

Browse files
committed
Adding eslint config and eslint fixes
1 parent fa13dee commit 1e2b5a4

File tree

14 files changed

+50
-148
lines changed

14 files changed

+50
-148
lines changed

eslint.config.js

Lines changed: 15 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -1,68 +1,20 @@
1-
import js from '@eslint/js';
21
import prettier from 'eslint-config-prettier';
32
import vue from 'eslint-plugin-vue';
4-
import globals from 'globals';
5-
import typescript from 'typescript-eslint';
63

7-
/** @type {import('eslint').Linter.Config[]} */
8-
export default [
9-
js.configs.recommended,
10-
...typescript.configs.recommended,
11-
{
12-
...vue.configs.flat.recommended,
13-
...vue.configs['flat/strongly-recommended'],
14-
...vue.configs['flat/essential'],
15-
languageOptions: {
16-
globals: {
17-
...globals.browser,
18-
},
19-
},
4+
import {
5+
defineConfigWithVueTs,
6+
vueTsConfigs,
7+
} from '@vue/eslint-config-typescript'
8+
9+
export default defineConfigWithVueTs(
10+
vue.configs['flat/essential'],
11+
vueTsConfigs.recommended, {
12+
ignores: ['vendor', 'node_modules', 'public', 'bootstrap/ssr', 'tailwind.config.js', 'resources/js/components/ui/*'],
13+
}, {
2014
rules: {
21-
'vue/match-component-import-name': 'warn',
22-
'vue/match-component-file-name': [
23-
'error',
24-
{
25-
extensions: ['vue'],
26-
shouldMatchCase: true,
27-
},
28-
],
29-
'vue/component-definition-name-casing': ['error', 'PascalCase'],
30-
'vue/block-tag-newline': [
31-
'warn',
32-
{
33-
singleline: 'always',
34-
multiline: 'always',
35-
maxEmptyLines: 0,
36-
},
37-
],
38-
'vue/html-self-closing': [
39-
'error',
40-
{
41-
html: {
42-
void: 'always',
43-
normal: 'never',
44-
component: 'always',
45-
},
46-
svg: 'always',
47-
math: 'always',
48-
},
49-
],
50-
'vue/require-default-prop': 'off',
51-
},
52-
},
53-
{
54-
plugins: {
55-
'@typescript-eslint': tseslint.plugin,
56-
},
57-
languageOptions: {
58-
parser: tseslint.parser,
59-
parserOptions: {
60-
project: true,
61-
},
62-
},
63-
},
64-
{
65-
ignores: ['vendor', 'node_modules', 'public', 'bootstrap/ssr', 'tailwind.config.js'],
15+
'vue/multi-word-component-names': 'off',
16+
'@typescript-eslint/no-explicit-any': 'off'
17+
}
6618
},
67-
prettier, // Turn off all rules that might conflict with Prettier
68-
];
19+
prettier
20+
)

package-lock.json

Lines changed: 30 additions & 16 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
},
3535
"dependencies": {
3636
"@types/ziggy-js": "^1.3.3",
37+
"@vue/eslint-config-typescript": "^14.3.0",
3738
"@vueuse/core": "^12.0.0",
3839
"class-variance-authority": "^0.7.1",
3940
"clsx": "^2.1.1",

resources/js/components/AppLogoIcon.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@ defineOptions({
66
});
77
88
interface Props {
9-
class?: HTMLAttributes['class'];
9+
className?: HTMLAttributes['class'];
1010
}
1111
1212
defineProps<Props>();
1313
</script>
1414

1515
<template>
16-
<svg viewBox="0 0 316 316" xmlns="http://www.w3.org/2000/svg" :class="class" v-bind="$attrs">
16+
<svg viewBox="0 0 316 316" xmlns="http://www.w3.org/2000/svg" :class="className" v-bind="$attrs">
1717
<path
1818
fill="currentColor"
1919
d="M305.8 81.125C305.77 80.995 305.69 80.885 305.65 80.755C305.56 80.525 305.49 80.285 305.37 80.075C305.29 79.935 305.17 79.815 305.07 79.685C304.94 79.515 304.83 79.325 304.68 79.175C304.55 79.045 304.39 78.955 304.25 78.845C304.09 78.715 303.95 78.575 303.77 78.475L251.32 48.275C249.97 47.495 248.31 47.495 246.96 48.275L194.51 78.475C194.33 78.575 194.19 78.725 194.03 78.845C193.89 78.955 193.73 79.045 193.6 79.175C193.45 79.325 193.34 79.515 193.21 79.685C193.11 79.815 192.99 79.935 192.91 80.075C192.79 80.285 192.71 80.525 192.63 80.755C192.58 80.875 192.51 80.995 192.48 81.125C192.38 81.495 192.33 81.875 192.33 82.265V139.625L148.62 164.795V52.575C148.62 52.185 148.57 51.805 148.47 51.435C148.44 51.305 148.36 51.195 148.32 51.065C148.23 50.835 148.16 50.595 148.04 50.385C147.96 50.245 147.84 50.125 147.74 49.995C147.61 49.825 147.5 49.635 147.35 49.485C147.22 49.355 147.06 49.265 146.92 49.155C146.76 49.025 146.62 48.885 146.44 48.785L93.99 18.585C92.64 17.805 90.98 17.805 89.63 18.585L37.18 48.785C37 48.885 36.86 49.035 36.7 49.155C36.56 49.265 36.4 49.355 36.27 49.485C36.12 49.635 36.01 49.825 35.88 49.995C35.78 50.125 35.66 50.245 35.58 50.385C35.46 50.595 35.38 50.835 35.3 51.065C35.25 51.185 35.18 51.305 35.15 51.435C35.05 51.805 35 52.185 35 52.575V232.235C35 233.795 35.84 235.245 37.19 236.025L142.1 296.425C142.33 296.555 142.58 296.635 142.82 296.725C142.93 296.765 143.04 296.835 143.16 296.865C143.53 296.965 143.9 297.015 144.28 297.015C144.66 297.015 145.03 296.965 145.4 296.865C145.5 296.835 145.59 296.775 145.69 296.745C145.95 296.655 146.21 296.565 146.45 296.435L251.36 236.035C252.72 235.255 253.55 233.815 253.55 232.245V174.885L303.81 145.945C305.17 145.165 306 143.725 306 142.155V82.265C305.95 81.875 305.89 81.495 305.8 81.125ZM144.2 227.205L100.57 202.515L146.39 176.135L196.66 147.195L240.33 172.335L208.29 190.625L144.2 227.205ZM244.75 114.995V164.795L226.39 154.225L201.03 139.625V89.825L219.39 100.395L244.75 114.995ZM249.12 57.105L292.81 82.265L249.12 107.425L205.43 82.265L249.12 57.105ZM114.49 184.425L96.13 194.995V85.305L121.49 70.705L139.85 60.135V169.815L114.49 184.425ZM91.76 27.425L135.45 52.585L91.76 77.745L48.07 52.585L91.76 27.425ZM43.67 60.135L62.03 70.705L87.39 85.305V202.545V202.555V202.565C87.39 202.735 87.44 202.895 87.46 203.055C87.49 203.265 87.49 203.485 87.55 203.695V203.705C87.6 203.875 87.69 204.035 87.76 204.195C87.84 204.375 87.89 204.575 87.99 204.745C87.99 204.745 87.99 204.755 88 204.755C88.09 204.905 88.22 205.035 88.33 205.175C88.45 205.335 88.55 205.495 88.69 205.635L88.7 205.645C88.82 205.765 88.98 205.855 89.12 205.965C89.28 206.085 89.42 206.225 89.59 206.325C89.6 206.325 89.6 206.325 89.61 206.335C89.62 206.335 89.62 206.345 89.63 206.345L139.87 234.775V285.065L43.67 229.705V60.135ZM244.75 229.705L148.58 285.075V234.775L219.8 194.115L244.75 179.875V229.705ZM297.2 139.625L253.49 164.795V114.995L278.85 100.395L297.21 89.825V139.625H297.2Z"

resources/js/components/AppShell.vue

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,6 @@
22
import { SidebarProvider } from '@/components/ui/sidebar';
33
import { onMounted, ref } from 'vue';
44
5-
interface Props {
6-
variant?: 'header' | 'sidebar';
7-
}
8-
9-
const props = withDefaults(defineProps<Props>(), {
10-
variant: 'header',
11-
});
12-
135
const isOpen = ref(true);
146
157
onMounted(() => {

resources/js/components/AppSidebarHeader.vue

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,6 @@
11
<script setup lang="ts">
22
import { Breadcrumb, BreadcrumbItem, BreadcrumbLink, BreadcrumbList, BreadcrumbPage, BreadcrumbSeparator } from '@/components/ui/breadcrumb';
33
import { SidebarTrigger } from '@/components/ui/sidebar';
4-
import { type BreadcrumbItem as BreadcrumbItemType } from '@/types';
5-
6-
interface Props {
7-
breadcrumbs?: BreadcrumbItemType[];
8-
}
9-
10-
const props = withDefaults(defineProps<Props>(), {
11-
breadcrumbs: () => [],
12-
});
134
</script>
145

156
<template>

resources/js/components/NavMain.vue

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,8 @@
11
<script setup lang="ts">
22
import { SidebarGroup, SidebarGroupLabel, SidebarMenu, SidebarMenuButton, SidebarMenuItem } from '@/components/ui/sidebar';
3-
import { type NavItem, type SharedData } from '@/types';
3+
import { type SharedData } from '@/types';
44
import { Link, usePage } from '@inertiajs/vue3';
55
6-
const props = defineProps<{
7-
items?: NavItem[];
8-
}>();
9-
106
const page = usePage<SharedData>();
117
</script>
128

resources/js/components/NavUser.vue

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,13 @@
22
import UserInfo from '@/components/UserInfo.vue';
33
import { DropdownMenu, DropdownMenuContent, DropdownMenuTrigger } from '@/components/ui/dropdown-menu';
44
import { SidebarMenu, SidebarMenuButton, SidebarMenuItem } from '@/components/ui/sidebar';
5-
import { useInitials } from '@/composables/useInitials';
65
import { type SharedData, type User } from '@/types';
76
import { usePage } from '@inertiajs/vue3';
87
import { ChevronsUpDown } from 'lucide-vue-next';
98
import UserMenuContent from './UserMenuContent.vue';
109
1110
const page = usePage<SharedData>();
1211
const user = page.props.auth.user as User;
13-
const { getInitials } = useInitials();
1412
</script>
1513

1614
<template>

resources/js/components/ui/dialog/DialogContent.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ const props = defineProps<DialogContentProps & { class?: HTMLAttributes['class']
1616
const emits = defineEmits<DialogContentEmits>();
1717
1818
const delegatedProps = computed(() => {
19-
const { class: _, ...delegated } = props;
19+
const { ...delegated } = props;
2020
2121
return delegated;
2222
});

resources/js/layouts/AuthLayout.vue

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,6 @@
11
<!-- AuthBase.vue -->
22
<script setup lang="ts">
33
import AuthLayout from '@/layouts/auth/AuthSplitLayout.vue';
4-
import { defineProps } from 'vue';
5-
6-
interface Props {
7-
title?: string;
8-
description?: string;
9-
}
10-
11-
const props = withDefaults(defineProps<Props>(), {
12-
title: undefined,
13-
description: undefined,
14-
});
154
</script>
165

176
<template>

0 commit comments

Comments
 (0)