diff --git a/adonisrc.ts b/adonisrc.ts index 8bf0b6f..450315e 100644 --- a/adonisrc.ts +++ b/adonisrc.ts @@ -97,7 +97,7 @@ export default defineConfig({ reloadServer: false, }, { - pattern: 'resources/assets/fonts/**', + pattern: 'inertia/assets/fonts/**', reloadServer: false, }, { diff --git a/app/services/og_image/og_image_renderer.ts b/app/services/og_image/og_image_renderer.ts index ad6085d..61f2084 100644 --- a/app/services/og_image/og_image_renderer.ts +++ b/app/services/og_image/og_image_renderer.ts @@ -111,7 +111,7 @@ export class OgImageGenerator { async #generateSvg(name: string, description: string) { const markup = this.#buildMarkup(name, description) - const fontsPath = app.makePath('resources/assets/fonts') + const fontsPath = app.makePath('inertia/assets/fonts') const fontPath1 = `${fontsPath}/Graphik-Regular.ttf` const fontPath2 = `${fontsPath}/PolySans-Median.ttf` diff --git a/config/inertia.ts b/config/inertia.ts index 60b8d9b..0154d24 100644 --- a/config/inertia.ts +++ b/config/inertia.ts @@ -1,8 +1,7 @@ import { defineConfig } from '@adonisjs/inertia' export default defineConfig({ - rootView: 'app_root', - assetsVersion: 1, + rootView: 'inertia', ssr: { enabled: true, }, diff --git a/eslint.config.js b/eslint.config.js index d145ece..c12afa0 100644 --- a/eslint.config.js +++ b/eslint.config.js @@ -1,9 +1,9 @@ -// @ts-check import { julr } from '@julr/tooling-configs/eslint' export default julr({ + unocss: false, typescript: { - tsconfigPath: ['./tsconfig.json', './resources/tsconfig.json'], + tsconfigPath: ['./tsconfig.json', './inertia/tsconfig.json'], typeAwareRules: false, }, }) diff --git a/resources/app.ts b/inertia/app/app.ts similarity index 93% rename from resources/app.ts rename to inertia/app/app.ts index e460169..4ab654b 100644 --- a/resources/app.ts +++ b/inertia/app/app.ts @@ -1,4 +1,4 @@ -import './css/app.css' +import '../css/app.css' import 'virtual:uno.css' import '@unocss/reset/tailwind.css' import 'floating-vue/dist/style.css' @@ -14,8 +14,8 @@ void createInertiaApp({ resolve: (name) => { return resolvePageComponent( - `./pages/${name}.vue`, - import.meta.glob('./pages/**/*.vue'), + `../pages/${name}.vue`, + import.meta.glob('../pages/**/*.vue'), ) }, diff --git a/resources/ssr.ts b/inertia/app/ssr.ts similarity index 83% rename from resources/ssr.ts rename to inertia/app/ssr.ts index 794a8d5..5e6b56c 100644 --- a/resources/ssr.ts +++ b/inertia/app/ssr.ts @@ -4,14 +4,14 @@ import { renderToString } from '@vue/server-renderer' import { createSSRApp, h, type DefineComponent, ref } from 'vue' import { resolvePageComponent } from '@adonisjs/inertia/helpers' -export default function render(page) { +export default function render(page: any) { return createInertiaApp({ page, render: renderToString, resolve: (name) => { return resolvePageComponent( - `./pages/${name}.vue`, - import.meta.glob('./pages/**/*.vue'), + `../pages/${name}.vue`, + import.meta.glob('../pages/**/*.vue'), ) }, diff --git a/resources/types.ts b/inertia/app/types.ts similarity index 80% rename from resources/types.ts rename to inertia/app/types.ts index 23bbc85..2e5076e 100644 --- a/resources/types.ts +++ b/inertia/app/types.ts @@ -1,6 +1,6 @@ import type { Ref } from 'vue' -export * from '../types/main.js' +export * from '../../types/main.js' declare module 'vue' { interface ComponentCustomProperties { diff --git a/uno.config.ts b/inertia/app/uno.config.ts similarity index 96% rename from uno.config.ts rename to inertia/app/uno.config.ts index 1e1319c..1ccd5d5 100644 --- a/uno.config.ts +++ b/inertia/app/uno.config.ts @@ -73,7 +73,7 @@ export default defineConfig({ scale: 1.2, warn: true, collections: { - custom: FileSystemIconLoader('./resources/assets/icons', (svg) => + custom: FileSystemIconLoader('./inertia/assets/icons', (svg) => svg.replace(/#fff/, 'currentColor'), ), }, diff --git a/resources/assets/adonis_logo.svg b/inertia/assets/adonis_logo.svg similarity index 100% rename from resources/assets/adonis_logo.svg rename to inertia/assets/adonis_logo.svg diff --git a/resources/assets/fonts/Graphik-Regular.ttf b/inertia/assets/fonts/Graphik-Regular.ttf similarity index 100% rename from resources/assets/fonts/Graphik-Regular.ttf rename to inertia/assets/fonts/Graphik-Regular.ttf diff --git a/resources/assets/fonts/PolySans-Median.ttf b/inertia/assets/fonts/PolySans-Median.ttf similarity index 100% rename from resources/assets/fonts/PolySans-Median.ttf rename to inertia/assets/fonts/PolySans-Median.ttf diff --git a/resources/assets/fonts/PolySans-Neutral.ttf b/inertia/assets/fonts/PolySans-Neutral.ttf similarity index 100% rename from resources/assets/fonts/PolySans-Neutral.ttf rename to inertia/assets/fonts/PolySans-Neutral.ttf diff --git a/resources/assets/fonts/PolySans-SlimItalic.ttf b/inertia/assets/fonts/PolySans-SlimItalic.ttf similarity index 100% rename from resources/assets/fonts/PolySans-SlimItalic.ttf rename to inertia/assets/fonts/PolySans-SlimItalic.ttf diff --git a/resources/assets/icons/adonis_icon.svg b/inertia/assets/icons/adonis_icon.svg similarity index 100% rename from resources/assets/icons/adonis_icon.svg rename to inertia/assets/icons/adonis_icon.svg diff --git a/resources/assets/noise.webp b/inertia/assets/noise.webp similarity index 100% rename from resources/assets/noise.webp rename to inertia/assets/noise.webp diff --git a/resources/assets/topography.svg b/inertia/assets/topography.svg similarity index 100% rename from resources/assets/topography.svg rename to inertia/assets/topography.svg diff --git a/resources/components/footer.vue b/inertia/components/footer.vue similarity index 100% rename from resources/components/footer.vue rename to inertia/components/footer.vue diff --git a/resources/components/header.vue b/inertia/components/header.vue similarity index 100% rename from resources/components/header.vue rename to inertia/components/header.vue diff --git a/resources/components/hero.vue b/inertia/components/hero.vue similarity index 100% rename from resources/components/hero.vue rename to inertia/components/hero.vue diff --git a/resources/components/icons/adonis_icon.vue b/inertia/components/icons/adonis_icon.vue similarity index 100% rename from resources/components/icons/adonis_icon.vue rename to inertia/components/icons/adonis_icon.vue diff --git a/resources/components/icons/adonis_logo.vue b/inertia/components/icons/adonis_logo.vue similarity index 100% rename from resources/components/icons/adonis_logo.vue rename to inertia/components/icons/adonis_logo.vue diff --git a/resources/components/package_logo.vue b/inertia/components/package_logo.vue similarity index 95% rename from resources/components/package_logo.vue rename to inertia/components/package_logo.vue index e5abb80..2f908ee 100644 --- a/resources/components/package_logo.vue +++ b/inertia/components/package_logo.vue @@ -1,7 +1,7 @@ @@ -111,3 +111,4 @@ const props = defineProps() } } +@/app/types diff --git a/inertia/tsconfig.json b/inertia/tsconfig.json new file mode 100644 index 0000000..4556624 --- /dev/null +++ b/inertia/tsconfig.json @@ -0,0 +1,14 @@ +{ + "extends": "@adonisjs/tsconfig/tsconfig.client.json", + "compilerOptions": { + "jsx": "preserve", + "jsxImportSource": "vue", + "baseUrl": ".", + "module": "ESNext", + "paths": { + "@/*": ["./*"], + "~/*": ["../*"] + } + }, + "include": ["env.d.ts", "./**/*.ts", "./**/*.vue"] +} diff --git a/package.json b/package.json index afe93d1..b11cf29 100644 --- a/package.json +++ b/package.json @@ -17,7 +17,7 @@ "build:preview": "pnpm build && sed 's/NODE_ENV=development/NODE_ENV=production/' .env > ./build/.env && cp -r ./content ./build/ && cp -r ./tmp ./build/", "quick:test": "node ace test", "typecheck:adonis": "tsc --noEmit -p tsconfig.json", - "typecheck:vue": "vue-tsc --noEmit -p resources/tsconfig.json", + "typecheck:vue": "vue-tsc --noEmit -p inertia/tsconfig.json", "typecheck": "pnpm typecheck:adonis && pnpm typecheck:vue", "checks": "pnpm lint && pnpm typecheck" }, @@ -37,12 +37,12 @@ "dependencies": { "@adonisjs/cache": "1.0.0-2", "@adonisjs/core": "6.3.1", - "@adonisjs/inertia": "1.0.0-13", + "@adonisjs/inertia": "1.0.0-19", "@adonisjs/lucid": "19.0.0", "@adonisjs/session": "7.1.1", "@adonisjs/shield": "8.1.1", "@adonisjs/static": "^1.1.1", - "@adonisjs/vite": "3.0.0-4", + "@adonisjs/vite": "3.0.0-8", "@formkit/auto-animate": "^0.8.1", "@headlessui/vue": "^1.7.19", "@inertiajs/vue3": "^1.0.15", @@ -73,8 +73,8 @@ "vue": "^3.4.21" }, "devDependencies": { - "@adonisjs/assembler": "7.2.2", - "@adonisjs/tsconfig": "^1.2.1", + "@adonisjs/assembler": "7.2.3", + "@adonisjs/tsconfig": "^1.3.0", "@faker-js/faker": "^8.4.1", "@iconify/json": "^2.2.166", "@iconify/utils": "^2.1.22", @@ -90,7 +90,7 @@ "@types/js-yaml": "^4.0.9", "@types/luxon": "^3.4.2", "@types/markdown-it": "^13.0.7", - "@types/node": "^20.11.21", + "@types/node": "^20.11.25", "@types/sanitize-html": "^2.11.0", "@unocss/reset": "^0.58.5", "@vitejs/plugin-vue": "^5.0.4", @@ -100,10 +100,10 @@ "postcss-nested": "^6.0.1", "prettier": "^3.2.5", "ts-node": "^10.9.2", - "typescript": "~5.2.2", + "typescript": "~5.4.2", "unocss": "^0.58.5", "unocss-preset-radix": "^2.5.5", - "vite": "^5.1.4", + "vite": "^5.1.5", "vue-tsc": "^1.8.27" }, "prettier": "@julr/tooling-configs/prettier" diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 05d45bd..daa50af 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -7,16 +7,16 @@ settings: dependencies: '@adonisjs/cache': specifier: 1.0.0-2 - version: 1.0.0-2(@adonisjs/assembler@7.2.2)(@adonisjs/core@6.3.1)(@adonisjs/lucid@19.0.0)(tslib@2.6.2) + version: 1.0.0-2(@adonisjs/assembler@7.2.3)(@adonisjs/core@6.3.1)(@adonisjs/lucid@19.0.0)(tslib@2.6.2) '@adonisjs/core': specifier: 6.3.1 - version: 6.3.1(@adonisjs/assembler@7.2.2)(@vinejs/vine@1.7.1)(edge.js@6.0.1) + version: 6.3.1(@adonisjs/assembler@7.2.3)(@vinejs/vine@1.7.1)(edge.js@6.0.1) '@adonisjs/inertia': - specifier: 1.0.0-13 - version: 1.0.0-13(@adonisjs/core@6.3.1)(@adonisjs/session@7.1.1)(@adonisjs/vite@3.0.0-4)(@japa/api-client@2.0.2)(edge.js@6.0.1) + specifier: 1.0.0-19 + version: 1.0.0-19(@adonisjs/core@6.3.1)(@adonisjs/session@7.1.1)(@adonisjs/vite@3.0.0-8)(@japa/api-client@2.0.2)(edge.js@6.0.1) '@adonisjs/lucid': specifier: 19.0.0 - version: 19.0.0(@adonisjs/assembler@7.2.2)(@adonisjs/core@6.3.1)(luxon@3.4.4)(sqlite3@5.1.7) + version: 19.0.0(@adonisjs/assembler@7.2.3)(@adonisjs/core@6.3.1)(luxon@3.4.4)(sqlite3@5.1.7) '@adonisjs/session': specifier: 7.1.1 version: 7.1.1(@adonisjs/core@6.3.1)(@japa/api-client@2.0.2)(@japa/browser-client@2.0.2)(edge.js@6.0.1) @@ -27,8 +27,8 @@ dependencies: specifier: ^1.1.1 version: 1.1.1(@adonisjs/core@6.3.1) '@adonisjs/vite': - specifier: 3.0.0-4 - version: 3.0.0-4(@adonisjs/core@6.3.1)(@adonisjs/shield@8.1.1)(edge.js@6.0.1)(vite@5.1.4) + specifier: 3.0.0-8 + version: 3.0.0-8(@adonisjs/core@6.3.1)(@adonisjs/shield@8.1.1)(edge.js@6.0.1)(vite@5.1.5) '@formkit/auto-animate': specifier: ^0.8.1 version: 0.8.1 @@ -112,15 +112,15 @@ dependencies: version: 5.1.7 vue: specifier: ^3.4.21 - version: 3.4.21(typescript@5.2.2) + version: 3.4.21(typescript@5.4.2) devDependencies: '@adonisjs/assembler': - specifier: 7.2.2 - version: 7.2.2(typescript@5.2.2) + specifier: 7.2.3 + version: 7.2.3(typescript@5.4.2) '@adonisjs/tsconfig': - specifier: ^1.2.1 - version: 1.2.1 + specifier: ^1.3.0 + version: 1.3.0 '@faker-js/faker': specifier: ^8.4.1 version: 8.4.1 @@ -150,7 +150,7 @@ devDependencies: version: 3.1.1 '@julr/tooling-configs': specifier: 2.1.0 - version: 2.1.0(eslint@8.57.0)(prettier@3.2.5)(typescript@5.2.2) + version: 2.1.0(eslint@8.57.0)(prettier@3.2.5)(typescript@5.4.2) '@julr/unocss-preset-forms': specifier: ^0.1.0 version: 0.1.0(unocss@0.58.5) @@ -167,8 +167,8 @@ devDependencies: specifier: ^13.0.7 version: 13.0.7 '@types/node': - specifier: ^20.11.21 - version: 20.11.21 + specifier: ^20.11.25 + version: 20.11.25 '@types/sanitize-html': specifier: ^2.11.0 version: 2.11.0 @@ -177,7 +177,7 @@ devDependencies: version: 0.58.5 '@vitejs/plugin-vue': specifier: ^5.0.4 - version: 5.0.4(vite@5.1.4)(vue@3.4.21) + version: 5.0.4(vite@5.1.5)(vue@3.4.21) eslint: specifier: ^8.57.0 version: 8.57.0 @@ -195,22 +195,22 @@ devDependencies: version: 3.2.5 ts-node: specifier: ^10.9.2 - version: 10.9.2(@swc/core@1.4.2)(@types/node@20.11.21)(typescript@5.2.2) + version: 10.9.2(@swc/core@1.4.2)(@types/node@20.11.25)(typescript@5.4.2) typescript: - specifier: ~5.2.2 - version: 5.2.2 + specifier: ~5.4.2 + version: 5.4.2 unocss: specifier: ^0.58.5 - version: 0.58.5(postcss@8.4.35)(vite@5.1.4) + version: 0.58.5(postcss@8.4.35)(vite@5.1.5) unocss-preset-radix: specifier: ^2.5.5 version: 2.5.5 vite: - specifier: ^5.1.4 - version: 5.1.4(@types/node@20.11.21) + specifier: ^5.1.5 + version: 5.1.5(@types/node@20.11.25) vue-tsc: specifier: ^1.8.27 - version: 1.8.27(typescript@5.2.2) + version: 1.8.27(typescript@5.4.2) packages: @@ -250,15 +250,15 @@ packages: glob-parent: 6.0.2 tempura: 0.4.0 - /@adonisjs/assembler@7.2.2(typescript@5.2.2): - resolution: {integrity: sha512-GZdKlN0cLtSh4QSoJbM8VSTA5lQXZbLmvUyQbVHEioDTKJAJuwXEegLvVsQz/bwoGUSFt4l0xZsI66NIItw8Mg==} + /@adonisjs/assembler@7.2.3(typescript@5.4.2): + resolution: {integrity: sha512-+qmqukeksDs08YYuydmroNX/HqLUXNC9odgdkfFSA0ivNcMWDjOp+jQYHECHwNqQfVOeSL+MLu/UQvJMq2mg4A==} engines: {node: '>=18.16.0'} peerDependencies: typescript: ^4.0.0 || ^5.0.0 dependencies: '@adonisjs/env': 5.0.1 '@antfu/install-pkg': 0.3.1 - '@poppinss/chokidar-ts': 4.1.3(typescript@5.2.2) + '@poppinss/chokidar-ts': 4.1.3(typescript@5.4.2) '@poppinss/cliui': 6.4.0 '@poppinss/hooks': 7.2.2 '@poppinss/utils': 6.7.2 @@ -272,7 +272,7 @@ packages: pretty-hrtime: 1.0.3 slash: 5.1.0 ts-morph: 21.0.1 - typescript: 5.2.2 + typescript: 5.4.2 transitivePeerDependencies: - babel-plugin-macros @@ -295,7 +295,7 @@ packages: qs: 6.11.2 raw-body: 2.5.2 - /@adonisjs/cache@1.0.0-2(@adonisjs/assembler@7.2.2)(@adonisjs/core@6.3.1)(@adonisjs/lucid@19.0.0)(tslib@2.6.2): + /@adonisjs/cache@1.0.0-2(@adonisjs/assembler@7.2.3)(@adonisjs/core@6.3.1)(@adonisjs/lucid@19.0.0)(tslib@2.6.2): resolution: {integrity: sha512-xHDS/7glxnJYCJGmLRdWKQCAPpNXHiyzKK3wRXSXCSKmRND6YSRiOoF7YypX4avn0XY35abkBBaKXlouEkr0sg==} engines: {node: '>=18.16.0'} peerDependencies: @@ -309,9 +309,9 @@ packages: '@adonisjs/redis': optional: true dependencies: - '@adonisjs/assembler': 7.2.2(typescript@5.2.2) - '@adonisjs/core': 6.3.1(@adonisjs/assembler@7.2.2)(@vinejs/vine@1.7.1)(edge.js@6.0.1) - '@adonisjs/lucid': 19.0.0(@adonisjs/assembler@7.2.2)(@adonisjs/core@6.3.1)(luxon@3.4.4)(sqlite3@5.1.7) + '@adonisjs/assembler': 7.2.3(typescript@5.4.2) + '@adonisjs/core': 6.3.1(@adonisjs/assembler@7.2.3)(@vinejs/vine@1.7.1)(edge.js@6.0.1) + '@adonisjs/lucid': 19.0.0(@adonisjs/assembler@7.2.3)(@adonisjs/core@6.3.1)(luxon@3.4.4)(sqlite3@5.1.7) bentocache: 1.0.0-beta.6(tslib@2.6.2) transitivePeerDependencies: - '@aws-sdk/client-dynamodb' @@ -326,7 +326,7 @@ packages: dependencies: '@poppinss/utils': 6.7.2 - /@adonisjs/core@6.3.1(@adonisjs/assembler@7.2.2)(@vinejs/vine@1.7.1)(edge.js@6.0.1): + /@adonisjs/core@6.3.1(@adonisjs/assembler@7.2.3)(@vinejs/vine@1.7.1)(edge.js@6.0.1): resolution: {integrity: sha512-ob4GDlGfou8wycfkwqX3ZQYkrQPBy9TcLbDaJMwC/6rkck/gPVaxaYxeB5VmQGPE1e2+CsuykdF6fJH4DrLQ9Q==} engines: {node: '>=20.6.0'} hasBin: true @@ -350,7 +350,7 @@ packages: dependencies: '@adonisjs/ace': 13.0.0 '@adonisjs/application': 8.1.0(@adonisjs/config@5.0.1)(@adonisjs/fold@10.0.1) - '@adonisjs/assembler': 7.2.2(typescript@5.2.2) + '@adonisjs/assembler': 7.2.3(typescript@5.4.2) '@adonisjs/bodyparser': 10.0.1(@adonisjs/http-server@7.1.0) '@adonisjs/config': 5.0.1 '@adonisjs/encryption': 6.0.1 @@ -391,10 +391,10 @@ packages: dotenv: 16.4.5 split-lines: 3.0.0 - /@adonisjs/eslint-plugin@1.2.1(eslint@8.57.0)(typescript@5.2.2): + /@adonisjs/eslint-plugin@1.2.1(eslint@8.57.0)(typescript@5.4.2): resolution: {integrity: sha512-dwL0x5An5n/q1sy4ZL3eUqqTGlTJKn/Z8m53m7/DpAHtvq4QZTaxUZ3rF5WgnNiI5Q8+wyc/JcQ+lvQ4T0vH+A==} dependencies: - '@typescript-eslint/utils': 6.21.0(eslint@8.57.0)(typescript@5.2.2) + '@typescript-eslint/utils': 6.21.0(eslint@8.57.0)(typescript@5.4.2) transitivePeerDependencies: - eslint - supports-color @@ -472,22 +472,22 @@ packages: vary: 1.1.2 youch: 3.3.3 - /@adonisjs/inertia@1.0.0-13(@adonisjs/core@6.3.1)(@adonisjs/session@7.1.1)(@adonisjs/vite@3.0.0-4)(@japa/api-client@2.0.2)(edge.js@6.0.1): - resolution: {integrity: sha512-75D9lVj/LPdrqBs4/wN19IuVXLoGES/SD0wHZVXCDAbbZ9MSRWnszf0+oPDAeINvnM5l1/CbWQw0UCqaYX8h2g==} + /@adonisjs/inertia@1.0.0-19(@adonisjs/core@6.3.1)(@adonisjs/session@7.1.1)(@adonisjs/vite@3.0.0-8)(@japa/api-client@2.0.2)(edge.js@6.0.1): + resolution: {integrity: sha512-P/09btPJQasjme0SpH1Q34H0ZrcoOacyIukm3iiRBGx60e5roS/zLHP+9ggiyw7TvxJ6ptKscsVMJYzkH3lS6A==} engines: {node: '>=18.16.0'} peerDependencies: '@adonisjs/core': ^6.2.0 '@adonisjs/session': ^7.0.0 - '@adonisjs/vite': ^3.0.0-4 + '@adonisjs/vite': ^3.0.0-6 '@japa/api-client': ^2.0.0 edge.js: ^6.0.0 peerDependenciesMeta: '@japa/api-client': optional: true dependencies: - '@adonisjs/core': 6.3.1(@adonisjs/assembler@7.2.2)(@vinejs/vine@1.7.1)(edge.js@6.0.1) + '@adonisjs/core': 6.3.1(@adonisjs/assembler@7.2.3)(@vinejs/vine@1.7.1)(edge.js@6.0.1) '@adonisjs/session': 7.1.1(@adonisjs/core@6.3.1)(@japa/api-client@2.0.2)(@japa/browser-client@2.0.2)(edge.js@6.0.1) - '@adonisjs/vite': 3.0.0-4(@adonisjs/core@6.3.1)(@adonisjs/shield@8.1.1)(edge.js@6.0.1)(vite@5.1.4) + '@adonisjs/vite': 3.0.0-8(@adonisjs/core@6.3.1)(@adonisjs/shield@8.1.1)(edge.js@6.0.1)(vite@5.1.5) '@japa/api-client': 2.0.2(@japa/assert@2.1.0)(@japa/runner@3.1.1) '@poppinss/utils': 6.7.2 crc-32: 1.2.2 @@ -506,7 +506,7 @@ packages: abstract-logging: 2.0.1 pino: 8.19.0 - /@adonisjs/lucid@19.0.0(@adonisjs/assembler@7.2.2)(@adonisjs/core@6.3.1)(luxon@3.4.4)(sqlite3@5.1.7): + /@adonisjs/lucid@19.0.0(@adonisjs/assembler@7.2.3)(@adonisjs/core@6.3.1)(luxon@3.4.4)(sqlite3@5.1.7): resolution: {integrity: sha512-poCchuJKORlMIQ9jAL8wH7AihZjVwHWePNJo17ISbBxlFJxKr9BBAsaCePwqGQECZXXw7QLxr0fkmAWtbc8cGw==} engines: {node: '>=18.16.0'} peerDependencies: @@ -519,9 +519,9 @@ packages: luxon: optional: true dependencies: - '@adonisjs/assembler': 7.2.2(typescript@5.2.2) - '@adonisjs/core': 6.3.1(@adonisjs/assembler@7.2.2)(@vinejs/vine@1.7.1)(edge.js@6.0.1) - '@adonisjs/presets': 2.2.5(@adonisjs/assembler@7.2.2)(@adonisjs/core@6.3.1) + '@adonisjs/assembler': 7.2.3(typescript@5.4.2) + '@adonisjs/core': 6.3.1(@adonisjs/assembler@7.2.3)(@vinejs/vine@1.7.1)(edge.js@6.0.1) + '@adonisjs/presets': 2.2.5(@adonisjs/assembler@7.2.3)(@adonisjs/core@6.3.1) '@faker-js/faker': 8.4.1 '@poppinss/hooks': 7.2.2 '@poppinss/macroable': 1.0.1 @@ -547,7 +547,7 @@ packages: - tedious dev: false - /@adonisjs/presets@2.2.5(@adonisjs/assembler@7.2.2)(@adonisjs/core@6.3.1): + /@adonisjs/presets@2.2.5(@adonisjs/assembler@7.2.3)(@adonisjs/core@6.3.1): resolution: {integrity: sha512-VgVU0b4WkRAAvn4GKlDAicfneu9s1StcviF5JbTwFkvzrz2AR3RIPzES2DeLvQTYXRq67RIxJWyGEKlJN7WTwA==} peerDependencies: '@adonisjs/assembler': ^7.0.0 @@ -556,8 +556,8 @@ packages: '@adonisjs/assembler': optional: true dependencies: - '@adonisjs/assembler': 7.2.2(typescript@5.2.2) - '@adonisjs/core': 6.3.1(@adonisjs/assembler@7.2.2)(@vinejs/vine@1.7.1)(edge.js@6.0.1) + '@adonisjs/assembler': 7.2.3(typescript@5.4.2) + '@adonisjs/core': 6.3.1(@adonisjs/assembler@7.2.3)(@vinejs/vine@1.7.1)(edge.js@6.0.1) '@poppinss/utils': 6.7.2 dev: false @@ -587,7 +587,7 @@ packages: edge.js: optional: true dependencies: - '@adonisjs/core': 6.3.1(@adonisjs/assembler@7.2.2)(@vinejs/vine@1.7.1)(edge.js@6.0.1) + '@adonisjs/core': 6.3.1(@adonisjs/assembler@7.2.3)(@vinejs/vine@1.7.1)(edge.js@6.0.1) '@japa/api-client': 2.0.2(@japa/assert@2.1.0)(@japa/runner@3.1.1) '@japa/browser-client': 2.0.2(@japa/assert@2.1.0)(@japa/runner@3.1.1)(playwright@1.42.0) '@poppinss/utils': 6.7.2 @@ -611,7 +611,7 @@ packages: edge.js: optional: true dependencies: - '@adonisjs/core': 6.3.1(@adonisjs/assembler@7.2.2)(@vinejs/vine@1.7.1)(edge.js@6.0.1) + '@adonisjs/core': 6.3.1(@adonisjs/assembler@7.2.3)(@vinejs/vine@1.7.1)(edge.js@6.0.1) '@adonisjs/session': 7.1.1(@adonisjs/core@6.3.1)(@japa/api-client@2.0.2)(@japa/browser-client@2.0.2)(edge.js@6.0.1) '@japa/api-client': 2.0.2(@japa/assert@2.1.0)(@japa/runner@3.1.1) '@poppinss/utils': 6.7.2 @@ -626,18 +626,18 @@ packages: peerDependencies: '@adonisjs/core': ^6.2.0 dependencies: - '@adonisjs/core': 6.3.1(@adonisjs/assembler@7.2.2)(@vinejs/vine@1.7.1)(edge.js@6.0.1) + '@adonisjs/core': 6.3.1(@adonisjs/assembler@7.2.3)(@vinejs/vine@1.7.1)(edge.js@6.0.1) serve-static: 1.15.0 transitivePeerDependencies: - supports-color dev: false - /@adonisjs/tsconfig@1.2.1: - resolution: {integrity: sha512-N8zdNw/bC3ft64e7CGr/LfYDCumoWe3wwePEqq2LRTCjBN/ICyxywW6f60QHLr+q17yHMU6fRFDt0GuRLXtPSA==} + /@adonisjs/tsconfig@1.3.0: + resolution: {integrity: sha512-+nOykDG44b4JSAdsrTdh5HuZqJpr6F+dHpfNYgHfYsFJIEtZo8plHilZAM7iabCRN5R49SPv5p8Ixcp47Rr50g==} dev: true - /@adonisjs/vite@3.0.0-4(@adonisjs/core@6.3.1)(@adonisjs/shield@8.1.1)(edge.js@6.0.1)(vite@5.1.4): - resolution: {integrity: sha512-qNmM0erD5U1ycVnPR+Zbfw0g0z8UAPKyDPXUdtAmqUbI8iD4FzBo3YoO4doaCtcg4GBpwywdskpq5E7AyFwMMw==} + /@adonisjs/vite@3.0.0-8(@adonisjs/core@6.3.1)(@adonisjs/shield@8.1.1)(edge.js@6.0.1)(vite@5.1.5): + resolution: {integrity: sha512-CMDBS93s+TwPmAmN1Wsm35duEkcO8baUSkeNPwsXz/OdEP4POMQa+LvUWkqGs+oCxKL/Rhq/w3rJIA/zwX0StQ==} engines: {node: '>=20.6.0'} peerDependencies: '@adonisjs/core': ^6.3.0 @@ -650,14 +650,14 @@ packages: edge.js: optional: true dependencies: - '@adonisjs/core': 6.3.1(@adonisjs/assembler@7.2.2)(@vinejs/vine@1.7.1)(edge.js@6.0.1) + '@adonisjs/core': 6.3.1(@adonisjs/assembler@7.2.3)(@vinejs/vine@1.7.1)(edge.js@6.0.1) '@adonisjs/shield': 8.1.1(@adonisjs/core@6.3.1)(@adonisjs/session@7.1.1)(@japa/api-client@2.0.2)(edge.js@6.0.1) '@poppinss/utils': 6.7.2 - '@vavite/multibuild': 4.1.1(vite@5.1.4) + '@vavite/multibuild': 4.1.1(vite@5.1.5) edge-error: 4.0.1 edge.js: 6.0.1 - vite: 5.1.4(@types/node@20.11.21) - vite-plugin-restart: 0.4.0(vite@5.1.4) + vite: 5.1.5(@types/node@20.11.25) + vite-plugin-restart: 0.4.0(vite@5.1.5) dev: false /@ampproject/remapping@2.2.1: @@ -1305,7 +1305,7 @@ packages: vue: ^3.2.0 dependencies: '@tanstack/vue-virtual': 3.1.2(vue@3.4.21) - vue: 3.4.21(typescript@5.2.2) + vue: 3.4.21(typescript@5.4.2) dev: false /@humanwhocodes/config-array@0.11.14: @@ -1372,7 +1372,7 @@ packages: '@inertiajs/core': 1.0.15 lodash.clonedeep: 4.5.0 lodash.isequal: 4.5.0 - vue: 3.4.21(typescript@5.2.2) + vue: 3.4.21(typescript@5.4.2) transitivePeerDependencies: - debug dev: false @@ -1479,7 +1479,7 @@ packages: playwright: optional: true dependencies: - '@adonisjs/core': 6.3.1(@adonisjs/assembler@7.2.2)(@vinejs/vine@1.7.1)(edge.js@6.0.1) + '@adonisjs/core': 6.3.1(@adonisjs/assembler@7.2.3)(@vinejs/vine@1.7.1)(edge.js@6.0.1) '@japa/api-client': 2.0.2(@japa/assert@2.1.0)(@japa/runner@3.1.1) '@japa/browser-client': 2.0.2(@japa/assert@2.1.0)(@japa/runner@3.1.1)(playwright@1.42.0) '@japa/runner': 3.1.1 @@ -1555,21 +1555,21 @@ packages: /@jsdevtools/ono@7.1.3: resolution: {integrity: sha512-4JQNk+3mVzK3xh2rqd6RB4J46qUR19azEHBneZyTZM+c456qOrbbM/5xcR8huNCCcbVt7+UmizG6GuUvPvKUYg==} - /@julr/tooling-configs@2.1.0(eslint@8.57.0)(prettier@3.2.5)(typescript@5.2.2): + /@julr/tooling-configs@2.1.0(eslint@8.57.0)(prettier@3.2.5)(typescript@5.4.2): resolution: {integrity: sha512-Jw/ei+NmSig/PJ1QafY7bPGsZSJXKmUHvHQG89Id55CFgkZM33Gpa09T8zDeSgCHVTg+SBCAsEaYPieuFaqweg==} dependencies: - '@adonisjs/eslint-plugin': 1.2.1(eslint@8.57.0)(typescript@5.2.2) + '@adonisjs/eslint-plugin': 1.2.1(eslint@8.57.0)(typescript@5.4.2) '@eslint/eslintrc': 2.1.4 - '@typescript-eslint/eslint-plugin': 6.21.0(@typescript-eslint/parser@6.21.0)(eslint@8.57.0)(typescript@5.2.2) - '@typescript-eslint/parser': 6.21.0(eslint@8.57.0)(typescript@5.2.2) - '@unocss/eslint-plugin': 0.57.7(eslint@8.57.0)(typescript@5.2.2) + '@typescript-eslint/eslint-plugin': 6.21.0(@typescript-eslint/parser@6.21.0)(eslint@8.57.0)(typescript@5.4.2) + '@typescript-eslint/parser': 6.21.0(eslint@8.57.0)(typescript@5.4.2) + '@unocss/eslint-plugin': 0.57.7(eslint@8.57.0)(typescript@5.4.2) eslint-config-flat-gitignore: 0.1.3 eslint-config-prettier: 9.1.0(eslint@8.57.0) eslint-plugin-i: 2.29.1(@typescript-eslint/parser@6.21.0)(eslint@8.57.0) eslint-plugin-jsdoc: 46.10.1(eslint@8.57.0) eslint-plugin-jsonc: 2.13.0(eslint@8.57.0) eslint-plugin-n: 16.6.2(eslint@8.57.0) - eslint-plugin-perfectionist: 2.5.0(eslint@8.57.0)(typescript@5.2.2)(vue-eslint-parser@9.4.2) + eslint-plugin-perfectionist: 2.5.0(eslint@8.57.0)(typescript@5.4.2)(vue-eslint-parser@9.4.2) eslint-plugin-prettier: 5.1.3(eslint-config-prettier@9.1.0)(eslint@8.57.0)(prettier@3.2.5) eslint-plugin-unicorn: 49.0.0(eslint@8.57.0) eslint-plugin-vue: 9.22.0(eslint@8.57.0) @@ -1595,7 +1595,7 @@ packages: peerDependencies: unocss: '>= 0.31.13 < 1' dependencies: - unocss: 0.58.5(postcss@8.4.35)(vite@5.1.4) + unocss: 0.58.5(postcss@8.4.35)(vite@5.1.5) dev: true /@lukeed/ms@2.0.2: @@ -1662,7 +1662,7 @@ packages: resolution: {integrity: sha512-2LuNTFBIO0m7kKIQvvPHN6UE63VjpmL9rnEEaOOaiSPbZK+zUOYIzBAWcED+3XYzhYsd/0mD57VdxAEqqV52CQ==} dev: true - /@poppinss/chokidar-ts@4.1.3(typescript@5.2.2): + /@poppinss/chokidar-ts@4.1.3(typescript@5.4.2): resolution: {integrity: sha512-v5Tx0mxt1fX6+acYKm1ZUhFMlGdcKgO1C8wSPRO/X44LjE0PduHGDDq6ePBrMDyg+EKnUUt3DcU9APRri7zEcA==} engines: {node: '>=18.16.0'} peerDependencies: @@ -1673,7 +1673,7 @@ packages: memoize: 10.0.0 picomatch: 3.0.1 slash: 5.1.0 - typescript: 5.2.2 + typescript: 5.4.2 /@poppinss/cliui@6.4.0: resolution: {integrity: sha512-8exOqpXxjQfJeHORAkbqzsQL2ybjKh22PD2UUq2poBemhxCH5KEe6qqu5nKc4KM3lhXc8QizlPMDxOIP+Pyt/w==} @@ -2178,7 +2178,7 @@ packages: vue: ^2.7.0 || ^3.0.0 dependencies: '@tanstack/virtual-core': 3.1.2 - vue: 3.4.21(typescript@5.2.2) + vue: 3.4.21(typescript@5.4.2) dev: false /@tokenizer/token@0.3.0: @@ -2275,8 +2275,8 @@ packages: resolution: {integrity: sha512-w+tIMs3rq2afQdsPJlODhoUEKzFP1ayaoyl1CcnwtIlsVe7K7bA1NGm4s3PraqTLlXnbIN84zuBlxBWo1u9BLw==} dev: false - /@types/node@20.11.21: - resolution: {integrity: sha512-/ySDLGscFPNasfqStUuWWPfL78jompfIoVzLJPVVAHBh6rpG68+pI2Gk+fNLeI8/f1yPYL4s46EleVIc20F1Ow==} + /@types/node@20.11.25: + resolution: {integrity: sha512-TBHyJxk2b7HceLVGFcpAUjsa5zIdsPWlR6XHfyGzd0SFu+/NFgQgMAl96MSDZgQDvJAvV6BKsFOrt6zIL09JDw==} dependencies: undici-types: 5.26.5 @@ -2299,7 +2299,7 @@ packages: /@types/sax@1.2.7: resolution: {integrity: sha512-rO73L89PJxeYM3s3pPPjiPgVVcymqU490g0YO5n5By0k2Erzj6tay/4lr1CHAAU4JyOWd1rpQ8bCf6cZfHU96A==} dependencies: - '@types/node': 20.11.21 + '@types/node': 20.11.25 dev: false /@types/semver@7.5.8: @@ -2310,7 +2310,7 @@ packages: resolution: {integrity: sha512-mEafCgyKiMFin24SDzWN7yAADt4gt6YawFiNMp0QS5ZPboORfyxFt0s3VzJKhTaKg9py/4FUmrHLTNfJKt9Rbw==} dependencies: '@types/cookiejar': 2.1.5 - '@types/node': 20.11.21 + '@types/node': 20.11.25 /@types/validator@13.11.9: resolution: {integrity: sha512-FCTsikRozryfayPuiI46QzH3fnrOoctTjvOYZkho9BTFLCOZ2rgZJHMOVgCOfttjPJcgOx52EpkY0CMfy87MIw==} @@ -2327,7 +2327,7 @@ packages: dependencies: '@types/yargs-parser': 21.0.3 - /@typescript-eslint/eslint-plugin@6.21.0(@typescript-eslint/parser@6.21.0)(eslint@8.57.0)(typescript@5.2.2): + /@typescript-eslint/eslint-plugin@6.21.0(@typescript-eslint/parser@6.21.0)(eslint@8.57.0)(typescript@5.4.2): resolution: {integrity: sha512-oy9+hTPCUFpngkEZUSzbf9MxI65wbKFoQYsgPdILTfbUldp5ovUuphZVe4i30emU9M/kP+T64Di0mxl7dSw3MA==} engines: {node: ^16.0.0 || >=18.0.0} peerDependencies: @@ -2339,10 +2339,10 @@ packages: optional: true dependencies: '@eslint-community/regexpp': 4.10.0 - '@typescript-eslint/parser': 6.21.0(eslint@8.57.0)(typescript@5.2.2) + '@typescript-eslint/parser': 6.21.0(eslint@8.57.0)(typescript@5.4.2) '@typescript-eslint/scope-manager': 6.21.0 - '@typescript-eslint/type-utils': 6.21.0(eslint@8.57.0)(typescript@5.2.2) - '@typescript-eslint/utils': 6.21.0(eslint@8.57.0)(typescript@5.2.2) + '@typescript-eslint/type-utils': 6.21.0(eslint@8.57.0)(typescript@5.4.2) + '@typescript-eslint/utils': 6.21.0(eslint@8.57.0)(typescript@5.4.2) '@typescript-eslint/visitor-keys': 6.21.0 debug: 4.3.4 eslint: 8.57.0 @@ -2350,13 +2350,13 @@ packages: ignore: 5.3.1 natural-compare: 1.4.0 semver: 7.6.0 - ts-api-utils: 1.2.1(typescript@5.2.2) - typescript: 5.2.2 + ts-api-utils: 1.2.1(typescript@5.4.2) + typescript: 5.4.2 transitivePeerDependencies: - supports-color dev: true - /@typescript-eslint/parser@6.21.0(eslint@8.57.0)(typescript@5.2.2): + /@typescript-eslint/parser@6.21.0(eslint@8.57.0)(typescript@5.4.2): resolution: {integrity: sha512-tbsV1jPne5CkFQCgPBcDOt30ItF7aJoZL997JSF7MhGQqOeT3svWRYxiqlfA5RUdlHN6Fi+EI9bxqbdyAUZjYQ==} engines: {node: ^16.0.0 || >=18.0.0} peerDependencies: @@ -2368,11 +2368,11 @@ packages: dependencies: '@typescript-eslint/scope-manager': 6.21.0 '@typescript-eslint/types': 6.21.0 - '@typescript-eslint/typescript-estree': 6.21.0(typescript@5.2.2) + '@typescript-eslint/typescript-estree': 6.21.0(typescript@5.4.2) '@typescript-eslint/visitor-keys': 6.21.0 debug: 4.3.4 eslint: 8.57.0 - typescript: 5.2.2 + typescript: 5.4.2 transitivePeerDependencies: - supports-color dev: true @@ -2385,7 +2385,7 @@ packages: '@typescript-eslint/visitor-keys': 6.21.0 dev: true - /@typescript-eslint/type-utils@6.21.0(eslint@8.57.0)(typescript@5.2.2): + /@typescript-eslint/type-utils@6.21.0(eslint@8.57.0)(typescript@5.4.2): resolution: {integrity: sha512-rZQI7wHfao8qMX3Rd3xqeYSMCL3SoiSQLBATSiVKARdFGCYSRvmViieZjqc58jKgs8Y8i9YvVVhRbHSTA4VBag==} engines: {node: ^16.0.0 || >=18.0.0} peerDependencies: @@ -2395,12 +2395,12 @@ packages: typescript: optional: true dependencies: - '@typescript-eslint/typescript-estree': 6.21.0(typescript@5.2.2) - '@typescript-eslint/utils': 6.21.0(eslint@8.57.0)(typescript@5.2.2) + '@typescript-eslint/typescript-estree': 6.21.0(typescript@5.4.2) + '@typescript-eslint/utils': 6.21.0(eslint@8.57.0)(typescript@5.4.2) debug: 4.3.4 eslint: 8.57.0 - ts-api-utils: 1.2.1(typescript@5.2.2) - typescript: 5.2.2 + ts-api-utils: 1.2.1(typescript@5.4.2) + typescript: 5.4.2 transitivePeerDependencies: - supports-color dev: true @@ -2410,7 +2410,7 @@ packages: engines: {node: ^16.0.0 || >=18.0.0} dev: true - /@typescript-eslint/typescript-estree@6.21.0(typescript@5.2.2): + /@typescript-eslint/typescript-estree@6.21.0(typescript@5.4.2): resolution: {integrity: sha512-6npJTkZcO+y2/kr+z0hc4HwNfrrP4kNYh57ek7yCNlrBjWQ1Y0OS7jiZTkgumrvkX5HkEKXFZkkdFNkaW2wmUQ==} engines: {node: ^16.0.0 || >=18.0.0} peerDependencies: @@ -2426,13 +2426,13 @@ packages: is-glob: 4.0.3 minimatch: 9.0.3 semver: 7.6.0 - ts-api-utils: 1.2.1(typescript@5.2.2) - typescript: 5.2.2 + ts-api-utils: 1.2.1(typescript@5.4.2) + typescript: 5.4.2 transitivePeerDependencies: - supports-color dev: true - /@typescript-eslint/utils@6.21.0(eslint@8.57.0)(typescript@5.2.2): + /@typescript-eslint/utils@6.21.0(eslint@8.57.0)(typescript@5.4.2): resolution: {integrity: sha512-NfWVaC8HP9T8cbKQxHcsJBY5YE1O33+jpMwN45qzWWaPDZgLIbo12toGMWnmhvCpd3sIxkpDw3Wv1B3dYrbDQQ==} engines: {node: ^16.0.0 || >=18.0.0} peerDependencies: @@ -2443,7 +2443,7 @@ packages: '@types/semver': 7.5.8 '@typescript-eslint/scope-manager': 6.21.0 '@typescript-eslint/types': 6.21.0 - '@typescript-eslint/typescript-estree': 6.21.0(typescript@5.2.2) + '@typescript-eslint/typescript-estree': 6.21.0(typescript@5.4.2) eslint: 8.57.0 semver: 7.6.0 transitivePeerDependencies: @@ -2463,7 +2463,7 @@ packages: resolution: {integrity: sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==} dev: true - /@unocss/astro@0.58.5(vite@5.1.4): + /@unocss/astro@0.58.5(vite@5.1.5): resolution: {integrity: sha512-LtuVnj8oFAK9663OVhQO8KpdJFiOyyPsYfnOZlDCOFK3gHb/2WMrzdBwr1w8LoQF3bDedkFMKirVF7gWjyZiaw==} peerDependencies: vite: ^2.9.0 || ^3.0.0-0 || ^4.0.0 || ^5.0.0-0 @@ -2473,8 +2473,8 @@ packages: dependencies: '@unocss/core': 0.58.5 '@unocss/reset': 0.58.5 - '@unocss/vite': 0.58.5(vite@5.1.4) - vite: 5.1.4(@types/node@20.11.21) + '@unocss/vite': 0.58.5(vite@5.1.5) + vite: 5.1.5(@types/node@20.11.25) transitivePeerDependencies: - rollup dev: true @@ -2529,11 +2529,11 @@ packages: resolution: {integrity: sha512-qbPqL+46hf1/UelQOwUwpAuvm6buoss43DPYHOPdfNJ+NTWkSpATQMF0JKT04QE0QRQbHNSHdMe9ariG+IIlCw==} dev: true - /@unocss/eslint-plugin@0.57.7(eslint@8.57.0)(typescript@5.2.2): + /@unocss/eslint-plugin@0.57.7(eslint@8.57.0)(typescript@5.4.2): resolution: {integrity: sha512-nwj7UJF7wCfPVl5B7cUB0xrSk6yuVMdMgABnsy4N5xBlds8cclrUO+boaTB9qzh8Lg9nfJVLB3+cW3po2SJoew==} engines: {node: '>=14'} dependencies: - '@typescript-eslint/utils': 6.21.0(eslint@8.57.0)(typescript@5.2.2) + '@typescript-eslint/utils': 6.21.0(eslint@8.57.0)(typescript@5.4.2) '@unocss/config': 0.57.7 '@unocss/core': 0.57.7 magic-string: 0.30.7 @@ -2688,7 +2688,7 @@ packages: '@unocss/core': 0.58.5 dev: true - /@unocss/vite@0.58.5(vite@5.1.4): + /@unocss/vite@0.58.5(vite@5.1.5): resolution: {integrity: sha512-p4o1XNX1rvjmoUqSSdua8XyWNg/d+YUChDd2L/xEty+6j2qv0wUaohs3UQ87vWlv632/UmgdX+2MbrgtqthCtw==} peerDependencies: vite: ^2.9.0 || ^3.0.0-0 || ^4.0.0 || ^5.0.0-0 @@ -2703,20 +2703,20 @@ packages: chokidar: 3.6.0 fast-glob: 3.3.2 magic-string: 0.30.7 - vite: 5.1.4(@types/node@20.11.21) + vite: 5.1.5(@types/node@20.11.25) transitivePeerDependencies: - rollup dev: true - /@vavite/multibuild@4.1.1(vite@5.1.4): + /@vavite/multibuild@4.1.1(vite@5.1.5): resolution: {integrity: sha512-R+UJWT2wH598OsGNA/NHgUgtOGvyh9kqaDsP/twJa/OJSH+RWgzj+ONQPqbkAYqPYu0NgRb8rkQOK4QJwdLx0A==} peerDependencies: vite: ^2.8.1 || 3 || 4 || 5 dependencies: - '@types/node': 20.11.21 + '@types/node': 20.11.25 cac: 6.7.14 picocolors: 1.0.0 - vite: 5.1.4(@types/node@20.11.21) + vite: 5.1.5(@types/node@20.11.25) dev: false /@vinejs/compiler@2.4.0: @@ -2736,15 +2736,15 @@ packages: normalize-url: 8.0.0 validator: 13.11.0 - /@vitejs/plugin-vue@5.0.4(vite@5.1.4)(vue@3.4.21): + /@vitejs/plugin-vue@5.0.4(vite@5.1.5)(vue@3.4.21): resolution: {integrity: sha512-WS3hevEszI6CEVEx28F8RjTX97k3KsrcY6kvTg7+Whm5y3oYvcqzVeGCU3hxSAn4uY2CLCkeokkGKpoctccilQ==} engines: {node: ^18.0.0 || >=20.0.0} peerDependencies: vite: ^5.0.0 vue: ^3.2.25 dependencies: - vite: 5.1.4(@types/node@20.11.21) - vue: 3.4.21(typescript@5.2.2) + vite: 5.1.5(@types/node@20.11.25) + vue: 3.4.21(typescript@5.4.2) dev: true /@volar/language-core@1.11.1: @@ -2817,7 +2817,7 @@ packages: '@vue/compiler-dom': 3.4.21 '@vue/shared': 3.4.21 - /@vue/language-core@1.8.27(typescript@5.2.2): + /@vue/language-core@1.8.27(typescript@5.4.2): resolution: {integrity: sha512-L8Kc27VdQserNaCUNiSFdDl9LWT24ly8Hpwf1ECy3aFb9m6bDhBGQYOujDm21N7EW3moKIOKEanQwe1q5BK+mA==} peerDependencies: typescript: '*' @@ -2833,7 +2833,7 @@ packages: minimatch: 9.0.3 muggle-string: 0.3.1 path-browserify: 1.0.1 - typescript: 5.2.2 + typescript: 5.4.2 vue-template-compiler: 2.7.16 dev: true @@ -2862,7 +2862,7 @@ packages: dependencies: '@vue/compiler-ssr': 3.4.21 '@vue/shared': 3.4.21 - vue: 3.4.21(typescript@5.2.2) + vue: 3.4.21(typescript@5.4.2) /@vue/shared@3.4.20: resolution: {integrity: sha512-KTEngal0aiUvNJ6I1Chk5Ew5XqChsFsxP4GKAYXWb99zKJWjNU72p2FWEOmZWHxHcqtniOJsgnpd3zizdpfEag==} @@ -4109,7 +4109,7 @@ packages: eslint-import-resolver-webpack: optional: true dependencies: - '@typescript-eslint/parser': 6.21.0(eslint@8.57.0)(typescript@5.2.2) + '@typescript-eslint/parser': 6.21.0(eslint@8.57.0)(typescript@5.4.2) debug: 3.2.7 eslint: 8.57.0 eslint-import-resolver-node: 0.3.9 @@ -4207,7 +4207,7 @@ packages: semver: 7.6.0 dev: true - /eslint-plugin-perfectionist@2.5.0(eslint@8.57.0)(typescript@5.2.2)(vue-eslint-parser@9.4.2): + /eslint-plugin-perfectionist@2.5.0(eslint@8.57.0)(typescript@5.4.2)(vue-eslint-parser@9.4.2): resolution: {integrity: sha512-F6XXcq4mKKUe/SREoMGQqzgw6cgCgf3pFzkFfQVIGtqD1yXVpQjnhTepzhBeZfxZwgMzR9HO4yH4CUhIQ2WBcQ==} peerDependencies: astro-eslint-parser: ^0.16.0 @@ -4225,7 +4225,7 @@ packages: vue-eslint-parser: optional: true dependencies: - '@typescript-eslint/utils': 6.21.0(eslint@8.57.0)(typescript@5.2.2) + '@typescript-eslint/utils': 6.21.0(eslint@8.57.0)(typescript@5.4.2) eslint: 8.57.0 minimatch: 9.0.3 natural-compare-lite: 1.4.0 @@ -4588,7 +4588,7 @@ packages: optional: true dependencies: '@floating-ui/dom': 1.1.1 - vue: 3.4.21(typescript@5.2.2) + vue: 3.4.21(typescript@5.4.2) vue-resize: 2.0.0-alpha.1(vue@3.4.21) dev: false @@ -7218,13 +7218,13 @@ packages: /truncatise@0.0.8: resolution: {integrity: sha512-cXzueh9pzBCsLzhToB4X4gZCb3KYkrsAcBAX97JnazE74HOl3cpBJYEV7nabHeG/6/WXCU5Yujlde/WPBUwnsg==} - /ts-api-utils@1.2.1(typescript@5.2.2): + /ts-api-utils@1.2.1(typescript@5.4.2): resolution: {integrity: sha512-RIYA36cJn2WiH9Hy77hdF9r7oEwxAtB/TS9/S4Qd90Ap4z5FSiin5zEiTL44OII1Y3IIlEvxwxFUVgrHSZ/UpA==} engines: {node: '>=16'} peerDependencies: typescript: '>=4.2.0' dependencies: - typescript: 5.2.2 + typescript: 5.4.2 dev: true /ts-morph@21.0.1: @@ -7233,7 +7233,7 @@ packages: '@ts-morph/common': 0.22.0 code-block-writer: 12.0.0 - /ts-node@10.9.2(@swc/core@1.4.2)(@types/node@20.11.21)(typescript@5.2.2): + /ts-node@10.9.2(@swc/core@1.4.2)(@types/node@20.11.25)(typescript@5.4.2): resolution: {integrity: sha512-f0FFpIdcHgn8zcPSbf1dRevwt047YMnaiJM3u2w2RewrB+fob/zePZcrOyQoLMMO7aBIddLcQIEK5dYjkLnGrQ==} hasBin: true peerDependencies: @@ -7253,14 +7253,14 @@ packages: '@tsconfig/node12': 1.0.11 '@tsconfig/node14': 1.0.3 '@tsconfig/node16': 1.0.4 - '@types/node': 20.11.21 + '@types/node': 20.11.25 acorn: 8.11.3 acorn-walk: 8.3.2 arg: 4.1.3 create-require: 1.1.1 diff: 4.0.2 make-error: 1.3.6 - typescript: 5.2.2 + typescript: 5.4.2 v8-compile-cache-lib: 3.0.1 yn: 3.1.1 dev: true @@ -7328,8 +7328,8 @@ packages: tslib: 2.6.2 dev: false - /typescript@5.2.2: - resolution: {integrity: sha512-mI4WrpHsbCIcwT9cF4FZvr80QUeKvsUsUvKDoR+X/7XHQH98xYD8YHZg7ANtz2GtZt/CBq2QJ0thkGJMHfqc1w==} + /typescript@5.4.2: + resolution: {integrity: sha512-+2/g0Fds1ERlP6JsakQQDXjZdZMM+rqpamFZJEKh4kwTIn3iDkgKtby0CeNd5ATNZ4Ry1ax15TMx0W2V+miizQ==} engines: {node: '>=14.17'} hasBin: true @@ -7397,7 +7397,7 @@ packages: '@unocss/core': 0.55.7 dev: true - /unocss@0.58.5(postcss@8.4.35)(vite@5.1.4): + /unocss@0.58.5(postcss@8.4.35)(vite@5.1.5): resolution: {integrity: sha512-0g4P6jLgRRNnhscxw7nQ9RHGrKJ1UPPiHPet+YT3TXUcmy4mTiYgo9+kGQf5bjyrzsELJ10cT6Qz2y6g9Tls4g==} engines: {node: '>=14'} peerDependencies: @@ -7409,7 +7409,7 @@ packages: vite: optional: true dependencies: - '@unocss/astro': 0.58.5(vite@5.1.4) + '@unocss/astro': 0.58.5(vite@5.1.5) '@unocss/cli': 0.58.5 '@unocss/core': 0.58.5 '@unocss/extractor-arbitrary-variants': 0.58.5 @@ -7428,8 +7428,8 @@ packages: '@unocss/transformer-compile-class': 0.58.5 '@unocss/transformer-directives': 0.58.5 '@unocss/transformer-variant-group': 0.58.5 - '@unocss/vite': 0.58.5(vite@5.1.4) - vite: 5.1.4(@types/node@20.11.21) + '@unocss/vite': 0.58.5(vite@5.1.5) + vite: 5.1.5(@types/node@20.11.25) transitivePeerDependencies: - postcss - rollup @@ -7481,17 +7481,17 @@ packages: resolution: {integrity: sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==} engines: {node: '>= 0.8'} - /vite-plugin-restart@0.4.0(vite@5.1.4): + /vite-plugin-restart@0.4.0(vite@5.1.5): resolution: {integrity: sha512-SXeyKQAzRFmEmEyGP2DjaTbx22D1K5MapyNiAP7Xa14UyFgNSDjZ86bfjWksA0pqn+bZyxnVLJpCiqDuG+tOcg==} peerDependencies: vite: ^2.9.0 || ^3.0.0 || ^4.0.0 || ^5.0.0 dependencies: micromatch: 4.0.5 - vite: 5.1.4(@types/node@20.11.21) + vite: 5.1.5(@types/node@20.11.25) dev: false - /vite@5.1.4(@types/node@20.11.21): - resolution: {integrity: sha512-n+MPqzq+d9nMVTKyewqw6kSt+R3CkvF9QAKY8obiQn8g1fwTscKxyfaYnC632HtBXAQGc1Yjomphwn1dtwGAHg==} + /vite@5.1.5(@types/node@20.11.25): + resolution: {integrity: sha512-BdN1xh0Of/oQafhU+FvopafUp6WaYenLU/NFoL5WyJL++GxkNfieKzBhM24H3HVsPQrlAqB7iJYTHabzaRed5Q==} engines: {node: ^18.0.0 || >=20.0.0} hasBin: true peerDependencies: @@ -7518,7 +7518,7 @@ packages: terser: optional: true dependencies: - '@types/node': 20.11.21 + '@types/node': 20.11.25 esbuild: 0.19.12 postcss: 8.4.35 rollup: 4.12.0 @@ -7537,7 +7537,7 @@ packages: '@vue/composition-api': optional: true dependencies: - vue: 3.4.21(typescript@5.2.2) + vue: 3.4.21(typescript@5.4.2) dev: false /vue-eslint-parser@9.4.2(eslint@8.57.0): @@ -7563,7 +7563,7 @@ packages: peerDependencies: vue: ^3.0.0 dependencies: - vue: 3.4.21(typescript@5.2.2) + vue: 3.4.21(typescript@5.4.2) dev: false /vue-template-compiler@2.7.16: @@ -7573,19 +7573,19 @@ packages: he: 1.2.0 dev: true - /vue-tsc@1.8.27(typescript@5.2.2): + /vue-tsc@1.8.27(typescript@5.4.2): resolution: {integrity: sha512-WesKCAZCRAbmmhuGl3+VrdWItEvfoFIPXOvUJkjULi+x+6G/Dy69yO3TBRJDr9eUlmsNAwVmxsNZxvHKzbkKdg==} hasBin: true peerDependencies: typescript: '*' dependencies: '@volar/typescript': 1.11.1 - '@vue/language-core': 1.8.27(typescript@5.2.2) + '@vue/language-core': 1.8.27(typescript@5.4.2) semver: 7.6.0 - typescript: 5.2.2 + typescript: 5.4.2 dev: true - /vue@3.4.21(typescript@5.2.2): + /vue@3.4.21(typescript@5.4.2): resolution: {integrity: sha512-5hjyV/jLEIKD/jYl4cavMcnzKwjMKohureP8ejn3hhEjwhWIhWeuzL2kJAjzl/WyVsgPY56Sy4Z40C3lVshxXA==} peerDependencies: typescript: '*' @@ -7598,7 +7598,7 @@ packages: '@vue/runtime-dom': 3.4.21 '@vue/server-renderer': 3.4.21(vue@3.4.21) '@vue/shared': 3.4.21 - typescript: 5.2.2 + typescript: 5.4.2 /wcwidth@1.0.1: resolution: {integrity: sha512-XHPEwS0q6TaxcvG85+8EYkbiCux2XtWG2mkc47Ng2A77BQu9+DqIOJldST4HgPkuea7dvKSj5VgX3P1d4rW8Tg==} diff --git a/resources/tsconfig.json b/resources/tsconfig.json deleted file mode 100644 index f0e0aa1..0000000 --- a/resources/tsconfig.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "compilerOptions": { - "target": "ESNext", - "jsx": "preserve", - "jsxImportSource": "vue", - "lib": ["DOM", "ESNext", "DOM.Iterable", "ES2020"], - "useDefineForClassFields": true, - "baseUrl": ".", - "module": "ESNext", - "moduleResolution": "Bundler", - "paths": { - "@/*": ["./*"], - "~/*": ["../*"] - }, - "resolveJsonModule": true, - "types": ["vite/client"], - "allowSyntheticDefaultImports": true, - "esModuleInterop": true, - "verbatimModuleSyntax": true, - "skipLibCheck": true - }, - "include": ["env.d.ts", "./**/*.ts", "./**/*.vue"] -} diff --git a/resources/views/app_root.edge b/resources/views/inertia.edge similarity index 94% rename from resources/views/app_root.edge rename to resources/views/inertia.edge index 3ebbd41..a93c3e9 100644 --- a/resources/views/app_root.edge +++ b/resources/views/inertia.edge @@ -26,7 +26,7 @@ @inertiaHead() - @vite(['resources/app.ts', `resources/pages/${page.component}.vue`]) + @vite(['inertia/app/app.ts', `inertia/pages/${page.component}.vue`]) diff --git a/tsconfig.json b/tsconfig.json index 165c5cf..d402753 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -21,5 +21,5 @@ "outDir": "./build" }, "include": ["./**/*"], - "exclude": ["./resources/**/*"] + "exclude": ["./inertia/**/*"] } diff --git a/vite.config.ts b/vite.config.ts index a0539d6..8d1311b 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -10,11 +10,13 @@ import inertia from '@adonisjs/inertia/client' export default defineConfig({ plugins: [ // @ts-expect-error missing types - unocss(), + unocss({ + configFile: 'inertia/app/uno.config.ts', + }), inertia({ ssr: { enabled: true, - entrypoint: 'resources/ssr.ts', + entrypoint: 'inertia/app/ssr.ts', }, }), vue({ @@ -22,14 +24,14 @@ export default defineConfig({ template: { compilerOptions: { isCustomElement: (tag) => ['model-viewer'].includes(tag) } }, }), adonisjs({ - entrypoints: ['resources/app.ts'], + entrypoints: ['inertia/app/app.ts'], reload: ['resources/views/**/*.edge'], }), ], resolve: { alias: { - '@/': `${resolve(getDirname(import.meta.url), 'resources')}/`, + '@/': `${resolve(getDirname(import.meta.url), 'inertia')}/`, '~/': `${resolve(getDirname(import.meta.url), '.')}/`, }, },