Skip to content

Commit aa69794

Browse files
Improve tests workflows for Starter Kits (#308)
Co-authored-by: WendellAdriel <11641518+WendellAdriel@users.noreply.github.com> Co-authored-by: WendellAdriel <me@wendelladriel.com>
1 parent 2d581a0 commit aa69794

File tree

15 files changed

+30
-23
lines changed

15 files changed

+30
-23
lines changed

composer.json

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,12 +58,19 @@
5858
"lint": [
5959
"pint --parallel"
6060
],
61-
"test:lint": [
61+
"lint:check": [
6262
"pint --parallel --test"
6363
],
64+
"ci:check": [
65+
"Composer\\Config::disableProcessTimeout",
66+
"npm run lint:check",
67+
"npm run format:check",
68+
"npm run types:check",
69+
"@test"
70+
],
6471
"test": [
6572
"@php artisan config:clear --ansi",
66-
"@test:lint",
73+
"@lint:check",
6774
"@php artisan test"
6875
],
6976
"post-autoload-dump": [

eslint.config.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,9 @@ export default defineConfigWithVueTs(
5353
'bootstrap/ssr',
5454
'tailwind.config.js',
5555
'vite.config.ts',
56+
'resources/js/actions/**',
5657
'resources/js/components/ui/*',
58+
'resources/js/routes/**',
5759
],
5860
},
5961
prettier, // Turn off all rules that might conflict with Prettier

package.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,9 @@
88
"dev": "vite",
99
"format": "prettier --write resources/",
1010
"format:check": "prettier --check resources/",
11-
"lint": "eslint . --fix"
11+
"lint": "eslint . --fix",
12+
"lint:check": "eslint .",
13+
"types:check": "vue-tsc --noEmit"
1214
},
1315
"devDependencies": {
1416
"@eslint/js": "^9.19.0",

resources/js/components/AppHeader.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ import UserMenuContent from '@/components/UserMenuContent.vue';
3535
import { useCurrentUrl } from '@/composables/useCurrentUrl';
3636
import { getInitials } from '@/composables/useInitials';
3737
import { toUrl } from '@/lib/utils';
38-
import type { BreadcrumbItem, NavItem } from '@/types';
3938
import { dashboard } from '@/routes';
39+
import type { BreadcrumbItem, NavItem } from '@/types';
4040
4141
type Props = {
4242
breadcrumbs?: BreadcrumbItem[];

resources/js/components/AppSidebar.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ import {
1414
SidebarMenuButton,
1515
SidebarMenuItem,
1616
} from '@/components/ui/sidebar';
17-
import type { NavItem } from '@/types';
1817
import { dashboard } from '@/routes';
18+
import type { NavItem } from '@/types';
1919
2020
const mainNavItems: NavItem[] = [
2121
{

resources/js/components/DeleteUser.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<script setup lang="ts">
22
import { Form } from '@inertiajs/vue3';
33
import { useTemplateRef } from 'vue';
4+
import ProfileController from '@/actions/App/Http/Controllers/Settings/ProfileController';
45
import Heading from '@/components/Heading.vue';
56
import InputError from '@/components/InputError.vue';
67
import { Button } from '@/components/ui/button';
@@ -16,7 +17,6 @@ import {
1617
} from '@/components/ui/dialog';
1718
import { Input } from '@/components/ui/input';
1819
import { Label } from '@/components/ui/label';
19-
import ProfileController from '@/actions/App/Http/Controllers/Settings/ProfileController';
2020
2121
const passwordInput = useTemplateRef('passwordInput');
2222
</script>

resources/js/components/TwoFactorSetupModal.vue

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ import {
2121
import { Spinner } from '@/components/ui/spinner';
2222
import { useAppearance } from '@/composables/useAppearance';
2323
import { useTwoFactorAuth } from '@/composables/useTwoFactorAuth';
24-
import type { TwoFactorConfigContent } from '@/types';
2524
import { confirm } from '@/routes/two-factor';
25+
import type { TwoFactorConfigContent } from '@/types';
2626
2727
type Props = {
2828
requiresConfirmation: boolean;
@@ -238,6 +238,7 @@ watch(
238238
<template v-else>
239239
<Form
240240
v-bind="confirm.form()"
241+
error-bag="confirmTwoFactorAuthentication"
241242
reset-on-error
242243
@finish="code = ''"
243244
@success="isOpen = false"
@@ -265,12 +266,7 @@ watch(
265266
/>
266267
</InputOTPGroup>
267268
</InputOTP>
268-
<InputError
269-
:message="
270-
errors?.confirmTwoFactorAuthentication
271-
?.code
272-
"
273-
/>
269+
<InputError :message="errors?.code" />
274270
</div>
275271

276272
<div class="flex w-full items-center space-x-5">

resources/js/components/UserMenuContent.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ import {
88
DropdownMenuSeparator,
99
} from '@/components/ui/dropdown-menu';
1010
import UserInfo from '@/components/UserInfo.vue';
11-
import type { User } from '@/types';
1211
import { logout } from '@/routes';
1312
import { edit } from '@/routes/profile';
13+
import type { User } from '@/types';
1414
1515
type Props = {
1616
user: User;

resources/js/layouts/settings/Layout.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ import { Button } from '@/components/ui/button';
55
import { Separator } from '@/components/ui/separator';
66
import { useCurrentUrl } from '@/composables/useCurrentUrl';
77
import { toUrl } from '@/lib/utils';
8-
import type { NavItem } from '@/types';
98
import { edit as editAppearance } from '@/routes/appearance';
109
import { edit as editProfile } from '@/routes/profile';
1110
import { show } from '@/routes/two-factor';
1211
import { edit as editPassword } from '@/routes/user-password';
12+
import type { NavItem } from '@/types';
1313
1414
const sidebarNavItems: NavItem[] = [
1515
{

resources/js/pages/Dashboard.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
import { Head } from '@inertiajs/vue3';
33
import PlaceholderPattern from '@/components/PlaceholderPattern.vue';
44
import AppLayout from '@/layouts/AppLayout.vue';
5-
import type { BreadcrumbItem } from '@/types';
65
import { dashboard } from '@/routes';
6+
import type { BreadcrumbItem } from '@/types';
77
88
const breadcrumbs: BreadcrumbItem[] = [
99
{

0 commit comments

Comments
 (0)