Skip to content

Commit 72396ce

Browse files
authored
Merge pull request #135 from justdlabs/laravel-11.x
Laravel 11.x
2 parents e8e3bd7 + c0b0fbe commit 72396ce

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

68 files changed

+2416
-2044
lines changed

.prettierignore

Lines changed: 0 additions & 6 deletions
This file was deleted.

.prettierrc

Lines changed: 0 additions & 12 deletions
This file was deleted.

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
### TL;DR
1+
### TL;DR
22

33
```bash
44
composer create-project justd/laravel your-project-name

biome.json

Lines changed: 80 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,80 @@
1+
{
2+
"$schema": "https://biomejs.dev/schemas/1.9.4/schema.json",
3+
"organizeImports": {
4+
"enabled": true
5+
},
6+
"vcs": {
7+
"enabled": false,
8+
"clientKind": "git",
9+
"useIgnoreFile": false
10+
},
11+
"files": {
12+
"ignoreUnknown": false,
13+
"ignore": ["vendor", "node_modules", "resources/js/ziggy.js"]
14+
},
15+
"linter": {
16+
"enabled": true,
17+
"rules": {
18+
"recommended": true,
19+
"style": {
20+
"noNonNullAssertion": "off",
21+
"noParameterAssign": "warn",
22+
"useImportType": "error"
23+
},
24+
"complexity": {
25+
"useArrowFunction": "error"
26+
},
27+
"a11y": {
28+
"noSvgWithoutTitle": "off",
29+
"useValidAnchor": "off",
30+
"useSemanticElements": "off"
31+
},
32+
"correctness": {
33+
"useHookAtTopLevel": "error",
34+
"noUnusedImports": "error",
35+
"useExhaustiveDependencies": "off",
36+
"noChildrenProp": "off"
37+
},
38+
"suspicious": {
39+
"noExplicitAny": "off",
40+
"noArrayIndexKey": "off",
41+
"noConsoleLog": "warn"
42+
},
43+
"nursery": {
44+
"useSortedClasses": {
45+
"level": "error",
46+
"fix": "safe",
47+
"options": {
48+
"attributes": ["classList"],
49+
"functions": ["cn", "twJoin", "tv", "composeRenderProps", "composeTailwindRenderProps"]
50+
}
51+
}
52+
}
53+
},
54+
"ignore": []
55+
},
56+
"formatter": {
57+
"enabled": true,
58+
"indentStyle": "space",
59+
"indentWidth": 2,
60+
"lineWidth": 100,
61+
"ignore": []
62+
},
63+
"javascript": {
64+
"formatter": {
65+
"quoteStyle": "double",
66+
"arrowParentheses": "always",
67+
"bracketSameLine": false,
68+
"bracketSpacing": true,
69+
"jsxQuoteStyle": "double",
70+
"quoteProperties": "asNeeded",
71+
"semicolons": "asNeeded",
72+
"trailingCommas": "all"
73+
}
74+
},
75+
"json": {
76+
"formatter": {
77+
"trailingCommas": "none"
78+
}
79+
}
80+
}

bun.lockb

1.27 KB
Binary file not shown.

package.json

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,12 @@
44
"scripts": {
55
"dev": "vite",
66
"build": "tsc && vite build && vite build --ssr",
7-
"format": "prettier --write .",
7+
"format": "biome format --write resources/js && biome lint --fix resources/js",
88
"release": "export GITHUB_TOKEN=$(cat .github_token) && release-it",
99
"preview": "tsc && npm run build && php artisan inertia:start-ssr"
1010
},
1111
"devDependencies": {
12+
"@biomejs/biome": "^1.9.4",
1213
"@commitlint/cli": "^19.7.1",
1314
"@commitlint/config-conventional": "^19.7.1",
1415
"@inertiajs/react": "^2.0.3",
@@ -21,20 +22,17 @@
2122
"axios": "^1.7.9",
2223
"husky": "^9.1.7",
2324
"laravel-vite-plugin": "^1.2.0",
24-
"prettier": "^3.4.2",
25-
"prettier-plugin-organize-imports": "^4.1.0",
26-
"prettier-plugin-tailwindcss": "^0.6.11",
2725
"release-it": "^17.11.0",
28-
"tailwindcss": "^4.0.4",
26+
"tailwindcss": "^4.0.6",
2927
"typescript": "^5.7.3",
3028
"vite-plugin-watch": "^0.3.1"
3129
},
3230
"dependencies": {
33-
"@tailwindcss/vite": "^4.0.4",
34-
"@types/node": "^22.13.1",
31+
"@tailwindcss/vite": "^4.0.6",
32+
"@types/node": "^22.13.4",
3533
"clsx": "^2.1.1",
36-
"justd-icons": "^1.10.24",
37-
"motion": "^12.4.0",
34+
"justd-icons": "^1.10.25",
35+
"motion": "^12.4.2",
3836
"react": "^19.0.0",
3937
"react-aria-components": "^1.6.0",
4038
"react-dom": "^19.0.0",

resources/css/app.css

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,9 @@
44
@variant dark (&:is(.dark *));
55

66
@theme {
7-
--font-sans: 'Figtree', ui-sans-serif, system-ui, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji',
8-
'Segoe UI Symbol', 'Noto Color Emoji';
7+
--font-sans:
8+
'Figtree', ui-sans-serif, system-ui, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol',
9+
'Noto Color Emoji';
910

1011
--color-border: var(--border);
1112
--color-input: var(--input);

resources/js/app.tsx

Lines changed: 19 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,33 @@
1-
import '../css/app.css';
2-
import './bootstrap';
1+
import "../css/app.css"
2+
import "./bootstrap"
33

4-
import { Providers } from '@/components/providers';
5-
import { Ziggy } from '@/ziggy';
6-
import { createInertiaApp } from '@inertiajs/react';
7-
import { resolvePageComponent } from 'laravel-vite-plugin/inertia-helpers';
8-
import { createRoot, hydrateRoot } from 'react-dom/client';
9-
import { useRoute } from 'ziggy-js';
4+
import { Providers } from "@/components/providers"
5+
import { Ziggy } from "@/ziggy"
6+
import { createInertiaApp } from "@inertiajs/react"
7+
import { resolvePageComponent } from "laravel-vite-plugin/inertia-helpers"
8+
import { createRoot, hydrateRoot } from "react-dom/client"
9+
import { useRoute } from "ziggy-js"
1010

11-
const appName = import.meta.env.VITE_APP_NAME || 'Laravel';
11+
const appName = import.meta.env.VITE_APP_NAME || "Laravel"
1212

1313
createInertiaApp({
14-
title: (title) => (title ? title + ' / ' + appName : appName),
15-
resolve: (name) => resolvePageComponent(`./pages/${name}.tsx`, import.meta.glob('./pages/**/*.tsx')),
14+
title: (title) => (title ? `${title} / ${appName}` : appName),
15+
resolve: (name) =>
16+
resolvePageComponent(`./pages/${name}.tsx`, import.meta.glob("./pages/**/*.tsx")),
1617
setup({ el, App, props }) {
1718
// @ts-expect-error
18-
window.route = useRoute(Ziggy as any);
19+
window.route = useRoute(Ziggy as any)
1920
const appElement = (
2021
<Providers>
2122
<App {...props} />
2223
</Providers>
23-
);
24+
)
2425
if (import.meta.env.SSR) {
25-
hydrateRoot(el, appElement);
26-
return;
26+
hydrateRoot(el, appElement)
27+
return
2728
}
2829

29-
createRoot(el).render(appElement);
30+
createRoot(el).render(appElement)
3031
},
31-
progress: false
32-
});
32+
progress: false,
33+
})

resources/js/bootstrap.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import axios from 'axios';
1+
import axios from "axios"
22

3-
window.axios = axios;
3+
window.axios = axios
44

5-
window.axios.defaults.headers.common['X-Requested-With'] = 'XMLHttpRequest';
5+
window.axios.defaults.headers.common["X-Requested-With"] = "XMLHttpRequest"
Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
1-
import { FlashMessageData } from '@/types/index';
2-
import { usePage } from '@inertiajs/react';
3-
import { useEffect } from 'react';
4-
import { toast } from 'sonner';
5-
import { Toast } from 'ui';
1+
import type { FlashMessageData } from "@/types"
2+
import { usePage } from "@inertiajs/react"
3+
import { useEffect } from "react"
4+
import { toast } from "sonner"
5+
import { Toast } from "ui"
66

77
export function FlashMessage() {
8-
const { flash_message } = usePage<{ flash_message: FlashMessageData }>().props;
8+
const { flash_message } = usePage<{ flash_message: FlashMessageData }>().props
99
useEffect(() => {
10-
if (flash_message && flash_message.message) {
11-
(toast as any)[flash_message.type](flash_message.message);
10+
if (flash_message?.message) {
11+
;(toast as any)[flash_message.type](flash_message.message)
1212
}
13-
}, [flash_message]);
14-
return <Toast />;
13+
}, [flash_message])
14+
return <Toast />
1515
}

0 commit comments

Comments
 (0)