Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions api-monorepo/apps/backend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,33 +39,33 @@
},
"devDependencies": {
"@adonisjs/assembler": "^8.4.0",
"@adonisjs/eslint-config": "^3.0.0",
"@adonisjs/prettier-config": "^1.4.5",
"@adonisjs/eslint-config": "^3.1.0",
"@adonisjs/prettier-config": "^1.5.0",
"@adonisjs/tsconfig": "^2.0.0",
"@japa/assert": "^4.2.0",
"@japa/plugin-adonisjs": "^5.2.0",
"@japa/runner": "^5.3.0",
"@poppinss/ts-exec": "^1.4.4",
"@types/luxon": "^3.7.1",
"@types/node": "~25.6.0",
"eslint": "^10.2.0",
"@types/node": "~25.9.1",
"eslint": "^10.4.0",
"hot-hook": "^1.0.0",
"pino-pretty": "^13.1.3",
"prettier": "^3.8.2",
"typescript": "~6.0.2",
"prettier": "^3.8.3",
"typescript": "~6.0.3",
"youch": "^4.1.1"
},
"dependencies": {
"@adonisjs/auth": "^10.1.0",
"@adonisjs/core": "^7.3.1",
"@adonisjs/core": "^7.3.3",
"@adonisjs/cors": "^3.0.0",
"@adonisjs/lucid": "^22.4.2",
"@adonisjs/session": "^8.1.0",
"@adonisjs/shield": "^9.0.0",
"@japa/api-client": "^3.2.1",
"@tuyau/core": "^1.2.2",
"@vinejs/vine": "^4.3.1",
"better-sqlite3": "^12.9.0",
"@vinejs/vine": "^4.4.0",
"better-sqlite3": "^12.10.0",
"luxon": "^3.7.2",
"reflect-metadata": "^0.2.2"
},
Expand Down
6 changes: 3 additions & 3 deletions api-monorepo/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@
"typecheck": "turbo typecheck"
},
"devDependencies": {
"@adonisjs/prettier-config": "^1.4.5",
"prettier": "^3.8.2",
"turbo": "^2.9.6"
"@adonisjs/prettier-config": "^1.5.0",
"prettier": "^3.8.3",
"turbo": "^2.9.16"
},
"packageManager": "npm@11.12.1",
"prettier": "@adonisjs/prettier-config"
Expand Down
18 changes: 9 additions & 9 deletions api/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,33 +39,33 @@
},
"devDependencies": {
"@adonisjs/assembler": "^8.4.0",
"@adonisjs/eslint-config": "^3.0.0",
"@adonisjs/prettier-config": "^1.4.5",
"@adonisjs/eslint-config": "^3.1.0",
"@adonisjs/prettier-config": "^1.5.0",
"@adonisjs/tsconfig": "^2.0.0",
"@japa/assert": "^4.2.0",
"@japa/plugin-adonisjs": "^5.2.0",
"@japa/runner": "^5.3.0",
"@poppinss/ts-exec": "^1.4.4",
"@types/luxon": "^3.7.1",
"@types/node": "~25.6.0",
"eslint": "^10.2.0",
"@types/node": "~25.9.1",
"eslint": "^10.4.0",
"hot-hook": "^1.0.0",
"pino-pretty": "^13.1.3",
"prettier": "^3.8.2",
"typescript": "~6.0.2",
"prettier": "^3.8.3",
"typescript": "~6.0.3",
"youch": "^4.1.1"
},
"dependencies": {
"@adonisjs/auth": "^10.1.0",
"@adonisjs/core": "^7.3.1",
"@adonisjs/core": "^7.3.3",
"@adonisjs/cors": "^3.0.0",
"@adonisjs/lucid": "^22.4.2",
"@adonisjs/session": "^8.1.0",
"@adonisjs/shield": "^9.0.0",
"@japa/api-client": "^3.2.1",
"@tuyau/core": "^1.2.2",
"@vinejs/vine": "^4.3.1",
"better-sqlite3": "^12.9.0",
"@vinejs/vine": "^4.4.0",
"better-sqlite3": "^12.10.0",
"luxon": "^3.7.2",
"reflect-metadata": "^0.2.2"
},
Expand Down
26 changes: 13 additions & 13 deletions hypermedia/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@
},
"devDependencies": {
"@adonisjs/assembler": "^8.4.0",
"@adonisjs/eslint-config": "^3.0.0",
"@adonisjs/prettier-config": "^1.4.5",
"@adonisjs/eslint-config": "^3.1.0",
"@adonisjs/prettier-config": "^1.5.0",
"@adonisjs/tsconfig": "^2.0.0",
"@japa/assert": "^4.2.0",
"@japa/browser-client": "^2.3.0",
Expand All @@ -47,27 +47,27 @@
"@poppinss/ts-exec": "^1.4.4",
"@types/alpinejs": "^3.13.11",
"@types/luxon": "^3.7.1",
"@types/node": "~25.6.0",
"alpinejs": "^3.15.11",
"eslint": "^10.2.0",
"@types/node": "~25.9.1",
"alpinejs": "^3.15.12",
"eslint": "^10.4.0",
"hot-hook": "^1.0.0",
"pino-pretty": "^13.1.3",
"prettier": "^3.8.2",
"typescript": "~6.0.2",
"vite": "^7.3.1",
"prettier": "^3.8.3",
"typescript": "~6.0.3",
"vite": "^7.3.3",
"youch": "^4.1.1"
},
"dependencies": {
"@adonisjs/auth": "^10.1.0",
"@adonisjs/core": "^7.3.1",
"@adonisjs/core": "^7.3.3",
"@adonisjs/lucid": "^22.4.2",
"@adonisjs/session": "^8.1.0",
"@adonisjs/shield": "^9.0.0",
"@adonisjs/static": "^2.0.1",
"@adonisjs/vite": "^5.1.0",
"@vinejs/vine": "^4.3.1",
"better-sqlite3": "^12.9.0",
"edge.js": "^6.5.0",
"@adonisjs/vite": "^5.1.1",
"@vinejs/vine": "^4.4.0",
"better-sqlite3": "^12.10.0",
"edge.js": "^6.5.1",
"luxon": "^3.7.2",
"reflect-metadata": "^0.2.2"
},
Expand Down
4 changes: 3 additions & 1 deletion inertia-react/eslint.config.js
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
import { configApp } from '@adonisjs/eslint-config'
export default configApp()
import { react } from '@adonisjs/eslint-config/react'

export default configApp(...react)
4 changes: 2 additions & 2 deletions inertia-react/inertia/app.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import './css/app.css'
import { ReactElement } from 'react'
import { type ReactElement } from 'react'
import { client } from './client'
import Layout from '~/layouts/default'
import { Data } from '@generated/data'
import { type Data } from '@generated/data'
import { createRoot } from 'react-dom/client'
import { createInertiaApp } from '@inertiajs/react'
import { TuyauProvider } from '@adonisjs/inertia/react'
Expand Down
7 changes: 4 additions & 3 deletions inertia-react/inertia/layouts/default.tsx
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
import { Data } from '@generated/data'
import { type Data } from '@generated/data'
import { toast, Toaster } from 'sonner'
import { usePage } from '@inertiajs/react'
import { ReactElement, useEffect } from 'react'
import { type ReactElement, useEffect } from 'react'
import { Form, Link } from '@adonisjs/inertia/react'

export default function Layout({ children }: { children: ReactElement<Data.SharedProps> }) {
const { url } = usePage()
useEffect(() => {
toast.dismiss()
}, [usePage().url])
}, [url])

useEffect(() => {
if (children.props.flash.error) {
Expand Down
6 changes: 3 additions & 3 deletions inertia-react/inertia/pages/home.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,17 @@ export default function Home() {
</div>

<div className="cards">
<a href="https://docs.adonisjs.com/introduction" target="_blank">
<a href="https://docs.adonisjs.com/introduction" target="_blank" rel="noreferrer">
<h3>Official Docs &nbsp;›</h3>
<p>Comprehensive reference for building with AdonisJS</p>
</a>

<a href="https://adocasts.com/" target="_blank">
<a href="https://adocasts.com/" target="_blank" rel="noreferrer">
<h3>Adocasts &nbsp;›</h3>
<p>Guided video tutorials for everyday development</p>
</a>

<a href="https://discord.gg/vDcEjq6" target="_blank">
<a href="https://discord.gg/vDcEjq6" target="_blank" rel="noreferrer">
<h3>Discord &nbsp;›</h3>
<p>Connect with developers building with AdonisJS every day</p>
</a>
Expand Down
6 changes: 3 additions & 3 deletions inertia-react/inertia/ssr.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { client } from '~/client'
import { ReactElement } from 'react'
import { type ReactElement } from 'react'
import Layout from '~/layouts/default'
import { Data } from '@generated/data'
import { type Data } from '@generated/data'
import ReactDOMServer from 'react-dom/server'
import { createInertiaApp } from '@inertiajs/react'
import { TuyauProvider } from '@adonisjs/inertia/react'
Expand All @@ -15,7 +15,7 @@ export default function render(page: any) {
return resolvePageComponent(
`./pages/${name}.tsx`,
import.meta.glob('./pages/**/*.tsx', { eager: true }),
(page: ReactElement<Data.SharedProps>) => <Layout children={page} />
(resolvedPage: ReactElement<Data.SharedProps>) => <Layout children={resolvedPage} />
)
},
setup: ({ App, props }) => {
Expand Down
1 change: 0 additions & 1 deletion inertia-react/inertia/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{
"extends": "@adonisjs/tsconfig/tsconfig.client.json",
"compilerOptions": {
"baseUrl": ".",
"module": "ESNext",
"jsx": "react-jsx",
"paths": {
Expand Down
46 changes: 29 additions & 17 deletions inertia-react/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,45 +38,47 @@
},
"devDependencies": {
"@adonisjs/assembler": "^8.4.0",
"@adonisjs/eslint-config": "^3.0.0",
"@adonisjs/prettier-config": "^1.4.5",
"@adonisjs/eslint-config": "^3.1.0",
"@adonisjs/prettier-config": "^1.5.0",
"@adonisjs/tsconfig": "^2.0.0",
"@japa/assert": "^4.2.0",
"@japa/browser-client": "^2.3.0",
"@japa/plugin-adonisjs": "^5.2.0",
"@japa/runner": "^5.3.0",
"@poppinss/ts-exec": "^1.4.4",
"@types/luxon": "^3.7.1",
"@types/node": "~25.6.0",
"@types/react": "^19.2.14",
"@types/node": "~25.9.1",
"@types/react": "^19.2.15",
"@types/react-dom": "^19.2.3",
"@vitejs/plugin-react": "^5.1.4",
"eslint": "^10.2.0",
"@vitejs/plugin-react": "^5.2.0",
"eslint": "^10.4.0",
"eslint-plugin-react": "^7.37.5",
"eslint-plugin-react-hooks": "^7.1.1",
"hot-hook": "^1.0.0",
"pino-pretty": "^13.1.3",
"prettier": "^3.8.2",
"typescript": "~6.0.2",
"vite": "^7.3.1",
"prettier": "^3.8.3",
"typescript": "~6.0.3",
"vite": "^7.3.3",
"youch": "^4.1.1"
},
"dependencies": {
"@adonisjs/auth": "^10.1.0",
"@adonisjs/core": "^7.3.1",
"@adonisjs/core": "^7.3.3",
"@adonisjs/cors": "^3.0.0",
"@adonisjs/inertia": "^4.2.0",
"@adonisjs/lucid": "^22.4.2",
"@adonisjs/session": "^8.1.0",
"@adonisjs/shield": "^9.0.0",
"@adonisjs/static": "^2.0.1",
"@adonisjs/vite": "^5.1.0",
"@inertiajs/react": "^2.3.18",
"@adonisjs/vite": "^5.1.1",
"@inertiajs/react": "^2.3.24",
"@tuyau/core": "^1.2.2",
"@vinejs/vine": "^4.3.1",
"better-sqlite3": "^12.9.0",
"edge.js": "^6.5.0",
"@vinejs/vine": "^4.4.0",
"better-sqlite3": "^12.10.0",
"edge.js": "^6.5.1",
"luxon": "^3.7.2",
"react": "^19.2.5",
"react-dom": "^19.2.5",
"react": "^19.2.6",
"react-dom": "^19.2.6",
"reflect-metadata": "^0.2.2",
"sonner": "^2.0.7"
},
Expand All @@ -86,5 +88,15 @@
"./app/middleware/*.ts"
]
},
"overrides": {
"eslint-plugin-react": {
"eslint": "$eslint"
}
},
"pnpm": {
"overrides": {
"eslint-plugin-react>eslint": "$eslint"
}
},
"prettier": "@adonisjs/prettier-config"
}
10 changes: 9 additions & 1 deletion inertia-vue/eslint.config.js
Original file line number Diff line number Diff line change
@@ -1,2 +1,10 @@
import { configApp } from '@adonisjs/eslint-config'
export default configApp()
import { vue } from '@adonisjs/eslint-config/vue'

export default configApp(...vue, {
name: 'inertia-vue ts overrides',
files: ['inertia/**/*.ts'],
rules: {
'vue/component-api-style': 'off',
},
})
6 changes: 3 additions & 3 deletions inertia-vue/inertia/pages/auth/login.vue
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@ import { Form } from '@adonisjs/inertia/vue'
</div>

<div>
<Form route="session.store" #default="{ processing, errors }">
<Form v-slot="{ processing, errors }" route="session.store">
<div>
<label for="email">Email</label>
<input
id="email"
type="email"
name="email"
id="email"
autocomplete="username"
:data-invalid="errors.email ? 'true' : undefined"
/>
Expand All @@ -26,9 +26,9 @@ import { Form } from '@adonisjs/inertia/vue'
<div>
<label for="password">Password</label>
<input
id="password"
type="password"
name="password"
id="password"
autocomplete="current-password"
:data-invalid="errors.password ? 'true' : undefined"
/>
Expand Down
Loading
Loading